From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 460AA89C13 for ; Tue, 4 Dec 2018 10:08:53 +0000 (UTC) From: Maxime Ripard Date: Tue, 4 Dec 2018 11:08:20 +0100 Message-Id: <20181204100826.15522-5-maxime.ripard@bootlin.com> In-Reply-To: References: MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 5/8] igt: fb: Move i915 buffer allocation to a function of its own List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: Petri Latvala , eben@raspberrypi.org, Thomas Petazzoni List-ID: VGhlIGNyZWF0ZV9ib19mb3JfZmIgZnVuY3Rpb24gaGFzIGEgcmF0aGVyIGJpZywgbm9uIHRyaXZp YWwgYmxvY2sgb2YKY29kZSB0byBhbGxvY2F0ZSBidWZmZXJzIGluIHNvbWUgbm9uLXRyaXZpYWwg c2l0dWF0aW9uIG9uIHRoZSBpOTE1CmRyaXZlci4KClNpbmNlIHRoaXMgaXMgYm90aCBub24tdHJp dmlhbCBhbmQgZHJpdmVyIHNwZWNpZmljLCBtb3ZlIHRoYXQgY29kZQppbnRvIGEgZnVuY3Rpb24g b2YgaXRzIG93biBzbyB0aGF0IHdlIGNhbiByZXdvcmsgdGhhdCBmdW5jdGlvbiBsYXRlcgpvbi4K ClNpZ25lZC1vZmYtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZS5yaXBhcmRAYm9vdGxpbi5jb20+ Ci0tLQogbGliL2lndF9mYi5jIHwgODkgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ3IGluc2VydGlvbnMoKyksIDQy IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfZmIuYyBiL2xpYi9pZ3RfZmIuYwpp bmRleCAyNDYyZDZiYTZmYWIuLmQ5NjY4OWFhNWZlNiAxMDA2NDQKLS0tIGEvbGliL2lndF9mYi5j CisrKyBiL2xpYi9pZ3RfZmIuYwpAQCAtNDUzLDYgKzQ1Myw1MiBAQCB1aW50NjRfdCBpZ3RfZmJf dGlsaW5nX3RvX21vZCh1aW50NjRfdCB0aWxpbmcpCiAJfQogfQogCitzdGF0aWMgaW50IGk5MTVf Y3JlYXRlX2dlbV9mb3JfZmIoc3RydWN0IGlndF9mYiAqZmIpCit7CisJYm9vbCBmdWxsX3Jhbmdl ID0gZmItPmNvbG9yX3JhbmdlID09IElHVF9DT0xPUl9ZQ0JDUl9GVUxMX1JBTkdFOworCWludCBm ZCA9IGZiLT5mZDsKKwl2b2lkICpwdHI7CisKKwlmYi0+Z2VtX2hhbmRsZSA9IGdlbV9jcmVhdGUo ZmQsIGZiLT5zaXplKTsKKwlnZW1fc2V0X3RpbGluZyhmZCwgZmItPmdlbV9oYW5kbGUsCisJCSAg ICAgICBpZ3RfZmJfbW9kX3RvX3RpbGluZyhmYi0+dGlsaW5nKSwKKwkJICAgICAgIGZiLT5zdHJp ZGVzWzBdKTsKKworCWdlbV9zZXRfZG9tYWluKGZkLCBmYi0+Z2VtX2hhbmRsZSwKKwkJICAgICAg IEk5MTVfR0VNX0RPTUFJTl9HVFQsIEk5MTVfR0VNX0RPTUFJTl9HVFQpOworCisJLyogRW5zdXJl IHRoZSBmcmFtZWJ1ZmZlciBpcyBwcmVhbGxvY2F0ZWQgKi8KKwlwdHIgPSBnZW1fbW1hcF9fZ3R0 KGZkLCBmYi0+Z2VtX2hhbmRsZSwKKwkJCSAgICBmYi0+c2l6ZSwgUFJPVF9SRUFEIHwgUFJPVF9X UklURSk7CisJaWd0X2Fzc2VydCgqKHVpbnQzMl90ICopcHRyID09IDApOworCisJc3dpdGNoIChm Yi0+ZHJtX2Zvcm1hdCkgeworCWNhc2UgRFJNX0ZPUk1BVF9OVjEyOgorCQltZW1zZXQocHRyICsg ZmItPm9mZnNldHNbMF0sCisJCSAgICAgICBmdWxsX3JhbmdlID8gMHgwMCA6IDB4MTAsCisJCSAg ICAgICBmYi0+c3RyaWRlc1swXSAqIGZiLT5wbGFuZV9oZWlnaHRbMF0pOworCQltZW1zZXQocHRy ICsgZmItPm9mZnNldHNbMV0sCisJCSAgICAgICAweDgwLAorCQkgICAgICAgZmItPnN0cmlkZXNb MV0gKiBmYi0+cGxhbmVfaGVpZ2h0WzFdKTsKKwkJYnJlYWs7CisJY2FzZSBEUk1fRk9STUFUX1lV WVY6CisJY2FzZSBEUk1fRk9STUFUX1lWWVU6CisJCXdtZW1zZXQocHRyICsgZmItPm9mZnNldHNb MF0sCisJCQlmdWxsX3JhbmdlID8gMHg4MDAwODAwMCA6IDB4ODAxMDgwMTAsCisJCQlmYi0+c3Ry aWRlc1swXSAqIGZiLT5wbGFuZV9oZWlnaHRbMF0gLyBzaXplb2Yod2NoYXJfdCkpOworCQlicmVh azsKKwljYXNlIERSTV9GT1JNQVRfVVlWWToKKwljYXNlIERSTV9GT1JNQVRfVllVWToKKwkJd21l bXNldChwdHIgKyBmYi0+b2Zmc2V0c1swXSwKKwkJCWZ1bGxfcmFuZ2UgPyAweDAwODAwMDgwIDog MHgxMDgwMTA4MCwKKwkJCWZiLT5zdHJpZGVzWzBdICogZmItPnBsYW5lX2hlaWdodFswXSAvIHNp emVvZih3Y2hhcl90KSk7CisJCWJyZWFrOworCX0KKwlnZW1fbXVubWFwKHB0ciwgZmItPnNpemUp OworCisJcmV0dXJuIGZiLT5nZW1faGFuZGxlOworfQorCiAvKiBoZWxwZXJzIHRvIGNyZWF0ZSBu aWNlLWxvb2tpbmcgZnJhbWVidWZmZXJzICovCiBzdGF0aWMgaW50IGNyZWF0ZV9ib19mb3JfZmIo c3RydWN0IGlndF9mYiAqZmIpCiB7CkBAIC00NzAsNDggKzUxNiw3IEBAIHN0YXRpYyBpbnQgY3Jl YXRlX2JvX2Zvcl9mYihzdHJ1Y3QgaWd0X2ZiICpmYikKIAkJZmItPmlzX2R1bWIgPSBmYWxzZTsK IAogCQlpZiAoaXNfaTkxNV9kZXZpY2UoZmQpKSB7Ci0JCQl2b2lkICpwdHI7Ci0JCQlib29sIGZ1 bGxfcmFuZ2UgPSBmYi0+Y29sb3JfcmFuZ2UgPT0gSUdUX0NPTE9SX1lDQkNSX0ZVTExfUkFOR0U7 Ci0KLQkJCWZiLT5nZW1faGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgZmItPnNpemUpOwotCi0JCQln ZW1fc2V0X3RpbGluZyhmZCwgZmItPmdlbV9oYW5kbGUsCi0JCQkJICAgICAgIGlndF9mYl9tb2Rf dG9fdGlsaW5nKGZiLT50aWxpbmcpLAotCQkJCSAgICAgICBmYi0+c3RyaWRlc1swXSk7Ci0KLQkJ CWdlbV9zZXRfZG9tYWluKGZkLCBmYi0+Z2VtX2hhbmRsZSwKLQkJCQkgICAgICAgSTkxNV9HRU1f RE9NQUlOX0dUVCwgSTkxNV9HRU1fRE9NQUlOX0dUVCk7Ci0KLQkJCS8qIEVuc3VyZSB0aGUgZnJh bWVidWZmZXIgaXMgcHJlYWxsb2NhdGVkICovCi0JCQlwdHIgPSBnZW1fbW1hcF9fZ3R0KGZkLCBm Yi0+Z2VtX2hhbmRsZSwKLQkJCQkJICAgIGZiLT5zaXplLCBQUk9UX1JFQUQgfCBQUk9UX1dSSVRF KTsKLQkJCWlndF9hc3NlcnQoKih1aW50MzJfdCAqKXB0ciA9PSAwKTsKLQotCQkJc3dpdGNoIChm Yi0+ZHJtX2Zvcm1hdCkgewotCQkJY2FzZSBEUk1fRk9STUFUX05WMTI6Ci0JCQkJbWVtc2V0KHB0 ciArIGZiLT5vZmZzZXRzWzBdLAotCQkJCSAgICAgICBmdWxsX3JhbmdlID8gMHgwMCA6IDB4MTAs Ci0JCQkJICAgICAgIGZiLT5zdHJpZGVzWzBdICogZmItPnBsYW5lX2hlaWdodFswXSk7Ci0JCQkJ bWVtc2V0KHB0ciArIGZiLT5vZmZzZXRzWzFdLAotCQkJCSAgICAgICAweDgwLAotCQkJCSAgICAg ICBmYi0+c3RyaWRlc1sxXSAqIGZiLT5wbGFuZV9oZWlnaHRbMV0pOwotCQkJCWJyZWFrOwotCQkJ Y2FzZSBEUk1fRk9STUFUX1lVWVY6Ci0JCQljYXNlIERSTV9GT1JNQVRfWVZZVToKLQkJCQl3bWVt c2V0KHB0ciArIGZiLT5vZmZzZXRzWzBdLAotCQkJCQlmdWxsX3JhbmdlID8gMHg4MDAwODAwMCA6 IDB4ODAxMDgwMTAsCi0JCQkJCWZiLT5zdHJpZGVzWzBdICogZmItPnBsYW5lX2hlaWdodFswXSAv IHNpemVvZih3Y2hhcl90KSk7Ci0JCQkJYnJlYWs7Ci0JCQljYXNlIERSTV9GT1JNQVRfVVlWWToK LQkJCWNhc2UgRFJNX0ZPUk1BVF9WWVVZOgotCQkJCXdtZW1zZXQocHRyICsgZmItPm9mZnNldHNb MF0sCi0JCQkJCWZ1bGxfcmFuZ2UgPyAweDAwODAwMDgwIDogMHgxMDgwMTA4MCwKLQkJCQkJZmIt PnN0cmlkZXNbMF0gKiBmYi0+cGxhbmVfaGVpZ2h0WzBdIC8gc2l6ZW9mKHdjaGFyX3QpKTsKLQkJ CQlicmVhazsKLQkJCX0KLQkJCWdlbV9tdW5tYXAocHRyLCBmYi0+c2l6ZSk7Ci0KLQkJCXJldHVy biBmYi0+Z2VtX2hhbmRsZTsKKwkJCXJldHVybiBpOTE1X2NyZWF0ZV9nZW1fZm9yX2ZiKGZiKTsK IAkJfSBlbHNlIHsKIAkJCWJvb2wgZHJpdmVyX2hhc19nZW1fYXBpID0gZmFsc2U7CiAKLS0gCjIu MTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0 LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2Cg==