From: Maarten Lankhorst Subject: [PATCH 14/15] drm/i915/gen11: Program the Y and UV plane for planar mode correctly. Date: Wed, 19 Sep 2018 15:56:43 +0200 Message-ID: <20180919135644.14182-15-maarten.lankhorst@linux.intel.com> References: <20180919135644.14182-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCDBE6E508 for ; Wed, 19 Sep 2018 13:56:53 +0000 (UTC) In-Reply-To: <20180919135644.14182-1-maarten.lankhorst@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 VGhlIFVWIHBsYW5lIGlzIHRoZSBtYXN0ZXIgcGxhbmUgdGhhdCBkb2VzIGFsbCBjb2xvciBjb3Jy ZWN0aW9uIGV0Yy4KSXQgbmVlZHMgdG8gYmUgcHJvZ3JhbW1lZCB3aXRoIHRoZSBkaW1lbnNpb25z IGZvciBjb2xvciBwbGFuZSAxIChVVikuCgpUaGUgWSBwbGFuZSBqdXN0IGZlZWRzIHRoZSBZIHBp eGVscyB0byBpdC4gUHJvZ3JhbSB0aGUgc2NhbGVyIGZyb20gdGhlCm1hc3RlciBvbmx5LCBhbmQg c2V0IFBMQU5FX0NUTF9ZVVY0MjBfWV9QTEFORSBvbiB0aGUgc2xhdmUgcGxhbmUuCgpDaGFuZ2Vz IHNpbmNlIHYxOgotIE1ha2UgYSBjb21tb24gc2tsX3Byb2dyYW1fcGxhbmUsIGFuZCB1c2UgaXQg Zm9yIGJvdGggcGxhbmUgdXBkYXRlcy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0 IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9yZWcuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYyB8IDUwICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiAyIGZpbGVzIGNoYW5n ZWQsIDM4IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oCmluZGV4IGI2MTRhMDZiNjZjNC4uYTMxMjlhNGMxNWNjIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKQEAgLTY1MTEsNiArNjUxMSw3IEBAIGVudW0gewogI2RlZmluZSAgIFBMQU5FX0NUTF9L RVlfRU5BQkxFX0RFU1RJTkFUSU9OCSgyIDw8IDIxKQogI2RlZmluZSAgIFBMQU5FX0NUTF9PUkRF Ul9CR1JYCQkJKDAgPDwgMjApCiAjZGVmaW5lICAgUExBTkVfQ1RMX09SREVSX1JHQlgJCQkoMSA8 PCAyMCkKKyNkZWZpbmUgICBQTEFORV9DVExfWVVWNDIwX1lfUExBTkUJCSgxIDw8IDE5KQogI2Rl ZmluZSAgIFBMQU5FX0NUTF9ZVVZfVE9fUkdCX0NTQ19GT1JNQVRfQlQ3MDkJKDEgPDwgMTgpCiAj ZGVmaW5lICAgUExBTkVfQ1RMX1lVVjQyMl9PUkRFUl9NQVNLCQkoMHgzIDw8IDE2KQogI2RlZmlu ZSAgIFBMQU5FX0NUTF9ZVVY0MjJfWVVZVgkJCSgwIDw8IDE2KQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYwppbmRleCA2ZTNiM2NlMzZkMTEuLmI5MDMzMzEzYjYwYSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTMzMiwyMyArMzMyLDIzIEBAIHNrbF9wcm9ncmFtX3Nj YWxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCSAgICAgICgoY3J0Y193 ICsgMSkgPDwgMTYpfChjcnRjX2ggKyAxKSk7CiB9CiAKLXZvaWQKLXNrbF91cGRhdGVfcGxhbmUo c3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKLQkJIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAotCQkgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZSkKK3N0YXRpYyB2b2lkCitza2xfcHJvZ3JhbV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxh bmUgKnBsYW5lLAorCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAorCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCisJCSAg aW50IGNvbG9yX3BsYW5lLCBib29sIHNsYXZlLCB1MzIgcGxhbmVfY3RsKQogewogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtPmJhc2UuZGV2KTsKIAll bnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gcGxhbmUtPmlkOwogCWVudW0gcGlwZSBwaXBlID0gcGxh bmUtPnBpcGU7Ci0JdTMyIHBsYW5lX2N0bCA9IHBsYW5lX3N0YXRlLT5jdGw7CiAJY29uc3Qgc3Ry dWN0IGRybV9pbnRlbF9zcHJpdGVfY29sb3JrZXkgKmtleSA9ICZwbGFuZV9zdGF0ZS0+Y2tleTsK LQl1MzIgc3VyZl9hZGRyID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lWzBdLm9mZnNldDsKLQl1 MzIgc3RyaWRlID0gc2tsX3BsYW5lX3N0cmlkZShwbGFuZV9zdGF0ZSwgMCk7CisJdTMyIHN1cmZf YWRkciA9IHBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVtjb2xvcl9wbGFuZV0ub2Zmc2V0OworCXUz MiBzdHJpZGUgPSBza2xfcGxhbmVfc3RyaWRlKHBsYW5lX3N0YXRlLCBjb2xvcl9wbGFuZSk7CiAJ dTMyIGF1eF9zdHJpZGUgPSBza2xfcGxhbmVfc3RyaWRlKHBsYW5lX3N0YXRlLCAxKTsKIAlpbnQg Y3J0Y194ID0gcGxhbmVfc3RhdGUtPmJhc2UuZHN0LngxOwogCWludCBjcnRjX3kgPSBwbGFuZV9z dGF0ZS0+YmFzZS5kc3QueTE7Ci0JdWludDMyX3QgeCA9IHBsYW5lX3N0YXRlLT5jb2xvcl9wbGFu ZVswXS54OwotCXVpbnQzMl90IHkgPSBwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0ueTsKKwl1 aW50MzJfdCB4ID0gcGxhbmVfc3RhdGUtPmNvbG9yX3BsYW5lW2NvbG9yX3BsYW5lXS54OworCXVp bnQzMl90IHkgPSBwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbY29sb3JfcGxhbmVdLnk7CiAJdWlu dDMyX3Qgc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVfc3RhdGUtPmJhc2Uuc3JjKSA+PiAx NjsKIAl1aW50MzJfdCBzcmNfaCA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVfc3RhdGUtPmJhc2Uu c3JjKSA+PiAxNjsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmxpbmtlZCA9IHBsYW5lX3N0YXRlLT5s aW5rZWRfcGxhbmU7CkBAIC00MDIsNyArNDAyLDkgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3Qg aW50ZWxfcGxhbmUgKnBsYW5lLAogCiAJLyogcHJvZ3JhbSBwbGFuZSBzY2FsZXIgKi8KIAlpZiAo cGxhbmVfc3RhdGUtPnNjYWxlcl9pZCA+PSAwKSB7Ci0JCXNrbF9wcm9ncmFtX3NjYWxlcihkZXZf cHJpdiwgcGxhbmUsIGNydGNfc3RhdGUsIHBsYW5lX3N0YXRlKTsKKwkJaWYgKCFzbGF2ZSkKKwkJ CXNrbF9wcm9ncmFtX3NjYWxlcihkZXZfcHJpdiwgcGxhbmUsCisJCQkJCSAgIGNydGNfc3RhdGUs IHBsYW5lX3N0YXRlKTsKIAogCQlJOTE1X1dSSVRFX0ZXKFBMQU5FX1BPUyhwaXBlLCBwbGFuZV9p ZCksIDApOwogCX0gZWxzZSB7CkBAIC00MTcsNiArNDE5LDI1IEBAIHNrbF91cGRhdGVfcGxhbmUo c3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZf cHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIH0KIAordm9pZAorc2tsX3VwZGF0ZV9wbGFu ZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAorCQkgY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUsCisJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBs YW5lX3N0YXRlKQoreworCXNrbF9wcm9ncmFtX3BsYW5lKHBsYW5lLCBjcnRjX3N0YXRlLCBwbGFu ZV9zdGF0ZSwKKwkJCSAgISFwbGFuZV9zdGF0ZS0+bGlua2VkX3BsYW5lLCBmYWxzZSwKKwkJCSAg cGxhbmVfc3RhdGUtPmN0bCk7Cit9CisKK3N0YXRpYyB2b2lkCitpY2xfdXBkYXRlX3NsYXZlKHN0 cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCisJCSBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSwKKwkJIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVf c3RhdGUpCit7CisJc2tsX3Byb2dyYW1fcGxhbmUocGxhbmUsIGNydGNfc3RhdGUsIHBsYW5lX3N0 YXRlLCAwLCB0cnVlLAorCQkJICBwbGFuZV9zdGF0ZS0+Y3RsIHwgUExBTkVfQ1RMX1lVVjQyMF9Z X1BMQU5FKTsKK30KKwogdm9pZAogc2tsX2Rpc2FibGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5l ICpwbGFuZSwgc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CkBAIC0xNzY4LDYgKzE3ODksNyBA QCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAljb25zdCB1aW50NjRfdCAqbW9kaWZpZXJzOwogCXVuc2lnbmVkIGludCBzdXBwb3J0 ZWRfcm90YXRpb25zOwogCWludCBudW1fcGxhbmVfZm9ybWF0czsKKwllbnVtIHBsYW5lX2lkIHBs YW5lX2lkID0gUExBTkVfU1BSSVRFMCArIHBsYW5lOwogCWludCByZXQ7CiAKIAlpbnRlbF9wbGFu ZSA9IGt6YWxsb2Moc2l6ZW9mKCppbnRlbF9wbGFuZSksIEdGUF9LRVJORUwpOwpAQCAtMTc4Nywx NiArMTgwOSwxOCBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJc3RhdGUtPnNjYWxlcl9pZCA9IC0xOwogCiAJCWludGVsX3Bs YW5lLT5oYXNfY2NzID0gc2tsX3BsYW5lX2hhc19jY3MoZGV2X3ByaXYsIHBpcGUsCi0JCQkJCQkJ IFBMQU5FX1NQUklURTAgKyBwbGFuZSk7CisJCQkJCQkJIHBsYW5lX2lkKTsKIAogCQlpbnRlbF9w bGFuZS0+bWF4X3N0cmlkZSA9IHNrbF9wbGFuZV9tYXhfc3RyaWRlOwogCQlpbnRlbF9wbGFuZS0+ dXBkYXRlX3BsYW5lID0gc2tsX3VwZGF0ZV9wbGFuZTsKKwkJaWYgKGljbF9pc19udjEyX3lfcGxh bmUocGxhbmVfaWQpKQorCQkJaW50ZWxfcGxhbmUtPnVwZGF0ZV9zbGF2ZSA9IGljbF91cGRhdGVf c2xhdmU7CiAJCWludGVsX3BsYW5lLT5kaXNhYmxlX3BsYW5lID0gc2tsX2Rpc2FibGVfcGxhbmU7 CiAJCWludGVsX3BsYW5lLT5nZXRfaHdfc3RhdGUgPSBza2xfcGxhbmVfZ2V0X2h3X3N0YXRlOwog CQlpbnRlbF9wbGFuZS0+Y2hlY2tfcGxhbmUgPSBza2xfcGxhbmVfY2hlY2s7CiAKIAkJaWYgKHNr bF9wbGFuZV9oYXNfcGxhbmFyKGRldl9wcml2LCBwaXBlLAotCQkJCQkgUExBTkVfU1BSSVRFMCAr IHBsYW5lKSkgeworCQkJCQkgcGxhbmVfaWQpKSB7CiAJCQlwbGFuZV9mb3JtYXRzID0gc2tsX3Bs YW5hcl9mb3JtYXRzOwogCQkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKHNrbF9wbGFu YXJfZm9ybWF0cyk7CiAJCX0gZWxzZSB7CkBAIC0xODcwLDcgKzE4OTQsNyBAQCBpbnRlbF9zcHJp dGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCWlu dGVsX3BsYW5lLT5waXBlID0gcGlwZTsKIAlpbnRlbF9wbGFuZS0+aTl4eF9wbGFuZSA9IHBsYW5l OwotCWludGVsX3BsYW5lLT5pZCA9IFBMQU5FX1NQUklURTAgKyBwbGFuZTsKKwlpbnRlbF9wbGFu ZS0+aWQgPSBwbGFuZV9pZDsKIAlpbnRlbF9wbGFuZS0+ZnJvbnRidWZmZXJfYml0ID0gSU5URUxf RlJPTlRCVUZGRVIocGlwZSwgaW50ZWxfcGxhbmUtPmlkKTsKIAogCXBvc3NpYmxlX2NydGNzID0g KDEgPDwgcGlwZSk7Ci0tIAoyLjE4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=