From: Ville Syrjala Subject: [PATCH v4 08/11] drm/i915: Introduce intel_plane_alloc() Date: Fri, 5 Oct 2018 15:58:14 +0300 Message-ID: <20181005125817.22576-9-ville.syrjala@linux.intel.com> References: <20181005125817.22576-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8D9926E801 for ; Fri, 5 Oct 2018 12:58:43 +0000 (UTC) In-Reply-To: <20181005125817.22576-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClB1 bGwgdGhlIGNvbW1vbiBwbGFuZStwbGFuZV9zdGF0ZSBhbGxvY2F0aW9uIGludG8gYSBzbWFsbCBo ZWxwZXIuClJlZHVjZXMgdGhlIGFtb3VudCBvZiBib2lsZXJwbGF0ZSBpbiB0aGUgcGxhbmUgaW5p dGlhbGl6YXRpb24KZnVuY3Rpb25zLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2 aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogU3RhbmlzbGF2IExpc292c2tp eSA8c3RhbmlzbGF2Lmxpc292c2tpeUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIHwgNDQgKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDUwICsrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCA1MCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNjY3OWFlNzUwOWZj Li45OWI2OWFmNDBjMDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEz NzM0LDggKzEzNzM0LDcgQEAgYm9vbCBza2xfcGxhbmVfaGFzX3BsYW5hcihzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgc3RydWN0IGludGVsX3BsYW5lICoKIGludGVs X3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg ZW51bSBwaXBlIHBpcGUpCiB7Ci0Jc3RydWN0IGludGVsX3BsYW5lICpwcmltYXJ5ID0gTlVMTDsK LQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlID0gTlVMTDsKKwlzdHJ1Y3QgaW50ZWxf cGxhbmUgKnByaW1hcnk7CiAJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9mdW5jcyAqcGxhbmVfZnVu Y3M7CiAJY29uc3QgdWludDMyX3QgKmludGVsX3ByaW1hcnlfZm9ybWF0czsKIAl1bnNpZ25lZCBp bnQgc3VwcG9ydGVkX3JvdGF0aW9uczsKQEAgLTEzNzQ0LDE5ICsxMzc0Myw5IEBAIGludGVsX3By aW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51 bSBwaXBlIHBpcGUpCiAJY29uc3QgdWludDY0X3QgKm1vZGlmaWVyczsKIAlpbnQgcmV0OwogCi0J cHJpbWFyeSA9IGt6YWxsb2Moc2l6ZW9mKCpwcmltYXJ5KSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCFw cmltYXJ5KSB7Ci0JCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gZmFpbDsKLQl9Ci0KLQlzdGF0ZSA9 IGludGVsX2NyZWF0ZV9wbGFuZV9zdGF0ZSgmcHJpbWFyeS0+YmFzZSk7Ci0JaWYgKCFzdGF0ZSkg ewotCQlyZXQgPSAtRU5PTUVNOwotCQlnb3RvIGZhaWw7Ci0JfQotCi0JcHJpbWFyeS0+YmFzZS5z dGF0ZSA9ICZzdGF0ZS0+YmFzZTsKKwlwcmltYXJ5ID0gaW50ZWxfcGxhbmVfYWxsb2MoKTsKKwlp ZiAoSVNfRVJSKHByaW1hcnkpKQorCQlyZXR1cm4gcHJpbWFyeTsKIAogCXByaW1hcnktPnBpcGUg PSBwaXBlOwogCS8qCkBAIC0xMzkwNyw4ICsxMzg5Niw3IEBAIGludGVsX3ByaW1hcnlfcGxhbmVf Y3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUp CiAJcmV0dXJuIHByaW1hcnk7CiAKIGZhaWw6Ci0Ja2ZyZWUoc3RhdGUpOwotCWtmcmVlKHByaW1h cnkpOworCWludGVsX3BsYW5lX2ZyZWUocHJpbWFyeSk7CiAKIAlyZXR1cm4gRVJSX1BUUihyZXQp OwogfQpAQCAtMTM5MTcsMjQgKzEzOTA1LDEzIEBAIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfcGxhbmUg KgogaW50ZWxfY3Vyc29yX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQkgIGVudW0gcGlwZSBwaXBlKQogewotCXN0cnVjdCBpbnRlbF9wbGFuZSAqY3Vy c29yID0gTlVMTDsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlID0gTlVMTDsKIAl1 bnNpZ25lZCBpbnQgcG9zc2libGVfY3J0Y3M7CisJc3RydWN0IGludGVsX3BsYW5lICpjdXJzb3I7 CiAJaW50IHJldDsKIAotCWN1cnNvciA9IGt6YWxsb2Moc2l6ZW9mKCpjdXJzb3IpLCBHRlBfS0VS TkVMKTsKLQlpZiAoIWN1cnNvcikgewotCQlyZXQgPSAtRU5PTUVNOwotCQlnb3RvIGZhaWw7Ci0J fQotCi0Jc3RhdGUgPSBpbnRlbF9jcmVhdGVfcGxhbmVfc3RhdGUoJmN1cnNvci0+YmFzZSk7Ci0J aWYgKCFzdGF0ZSkgewotCQlyZXQgPSAtRU5PTUVNOwotCQlnb3RvIGZhaWw7Ci0JfQotCi0JY3Vy c29yLT5iYXNlLnN0YXRlID0gJnN0YXRlLT5iYXNlOworCWN1cnNvciA9IGludGVsX3BsYW5lX2Fs bG9jKCk7CisJaWYgKElTX0VSUihjdXJzb3IpKQorCQlyZXR1cm4gY3Vyc29yOwogCiAJY3Vyc29y LT5waXBlID0gcGlwZTsKIAljdXJzb3ItPmk5eHhfcGxhbmUgPSAoZW51bSBpOXh4X3BsYW5lX2lk KSBwaXBlOwpAQCAtMTM5ODQsOCArMTM5NjEsNyBAQCBpbnRlbF9jdXJzb3JfcGxhbmVfY3JlYXRl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gY3Vyc29yOwogCiBm YWlsOgotCWtmcmVlKHN0YXRlKTsKLQlrZnJlZShjdXJzb3IpOworCWludGVsX3BsYW5lX2ZyZWUo Y3Vyc29yKTsKIAogCXJldHVybiBFUlJfUFRSKHJldCk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCmluZGV4IDQzMTkwYzZlOWVmMi4uMGUwZjc2MzkwN2VmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtMjE0MSw2ICsyMTQxLDggQEAgaW50IHNrbF9wbGFuZV9jaGVjayhzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIGludCBpbnRlbF9wbGFuZV9jaGVja19zdHJp ZGUoY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7CiBpbnQgaW50 ZWxfcGxhbmVfY2hlY2tfc3JjX2Nvb3JkaW5hdGVzKHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGUpOwogaW50IGNodl9wbGFuZV9jaGVja19yb3RhdGlvbihjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKTsKK3N0cnVjdCBpbnRlbF9wbGFuZSAqaW50 ZWxfcGxhbmVfYWxsb2Modm9pZCk7Cit2b2lkIGludGVsX3BsYW5lX2ZyZWUoc3RydWN0IGludGVs X3BsYW5lICpwbGFuZSk7CiAKIC8qIGludGVsX3R2LmMgKi8KIHZvaWQgaW50ZWxfdHZfaW5pdChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYwppbmRleCA1ODYwNTMwMjg5YjUuLjgzOTBiNTg5NGI0MCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE3OTMsMTIgKzE3OTMsNDAgQEAgYm9vbCBza2xfcGxhbmVf aGFzX2NjcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCSBwbGFuZV9pZCA9 PSBQTEFORV9TUFJJVEUwKTsKIH0KIAorc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZV9h bGxvYyh2b2lkKQoreworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CisJ c3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKKworCXBsYW5lID0ga3phbGxvYyhzaXplb2YoKnBs YW5lKSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFwbGFuZSkKKwkJcmV0dXJuIEVSUl9QVFIoLUVOT01F TSk7CisKKwlwbGFuZV9zdGF0ZSA9IGludGVsX2NyZWF0ZV9wbGFuZV9zdGF0ZSgmcGxhbmUtPmJh c2UpOworCWlmICghcGxhbmVfc3RhdGUpIHsKKwkJa2ZyZWUocGxhbmUpOworCQlyZXR1cm4gRVJS X1BUUigtRU5PTUVNKTsKKwl9CisKKwlwbGFuZS0+YmFzZS5zdGF0ZSA9ICZwbGFuZV9zdGF0ZS0+ YmFzZTsKKworCXJldHVybiBwbGFuZTsKK30KKwordm9pZCBpbnRlbF9wbGFuZV9mcmVlKHN0cnVj dCBpbnRlbF9wbGFuZSAqcGxhbmUpCit7CisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZSA9CisJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5iYXNlLnN0YXRlKTsKKwor CWtmcmVlKHBsYW5lX3N0YXRlKTsKKwlrZnJlZShwbGFuZSk7Cit9CisKIHN0cnVjdCBpbnRlbF9w bGFuZSAqCiBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJCSAgZW51bSBwaXBlIHBpcGUsIGludCBwbGFuZSkKIHsKLQlzdHJ1Y3Qg aW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gTlVMTDsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnN0YXRlID0gTlVMTDsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwogCWNv bnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgKnBsYW5lX2Z1bmNzOwogCXVuc2lnbmVkIGxvbmcg cG9zc2libGVfY3J0Y3M7CiAJY29uc3QgdWludDMyX3QgKnBsYW5lX2Zvcm1hdHM7CkBAIC0xODA3 LDE4ICsxODM1LDkgQEAgaW50ZWxfc3ByaXRlX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJaW50IG51bV9wbGFuZV9mb3JtYXRzOwogCWludCByZXQ7CiAK LQlpbnRlbF9wbGFuZSA9IGt6YWxsb2Moc2l6ZW9mKCppbnRlbF9wbGFuZSksIEdGUF9LRVJORUwp OwotCWlmICghaW50ZWxfcGxhbmUpIHsKLQkJcmV0ID0gLUVOT01FTTsKLQkJZ290byBmYWlsOwot CX0KLQotCXN0YXRlID0gaW50ZWxfY3JlYXRlX3BsYW5lX3N0YXRlKCZpbnRlbF9wbGFuZS0+YmFz ZSk7Ci0JaWYgKCFzdGF0ZSkgewotCQlyZXQgPSAtRU5PTUVNOwotCQlnb3RvIGZhaWw7Ci0JfQot CWludGVsX3BsYW5lLT5iYXNlLnN0YXRlID0gJnN0YXRlLT5iYXNlOworCWludGVsX3BsYW5lID0g aW50ZWxfcGxhbmVfYWxsb2MoKTsKKwlpZiAoSVNfRVJSKGludGVsX3BsYW5lKSkKKwkJcmV0dXJu IGludGVsX3BsYW5lOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewogCQlpbnRl bF9wbGFuZS0+aGFzX2NjcyA9IHNrbF9wbGFuZV9oYXNfY2NzKGRldl9wcml2LCBwaXBlLApAQCAt MTk1Nyw4ICsxOTc2LDcgQEAgaW50ZWxfc3ByaXRlX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJcmV0dXJuIGludGVsX3BsYW5lOwogCiBmYWlsOgotCWtm cmVlKHN0YXRlKTsKLQlrZnJlZShpbnRlbF9wbGFuZSk7CisJaW50ZWxfcGxhbmVfZnJlZShpbnRl bF9wbGFuZSk7CiAKIAlyZXR1cm4gRVJSX1BUUihyZXQpOwogfQotLSAKMi4xNi40CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK