From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Strasser Subject: [PATCH v4 2/3] drm/i915: Refactor icl_is_hdr_plane Date: Wed, 6 Feb 2019 10:02:12 -0800 Message-ID: <1549476133-9172-3-git-send-email-kevin.strasser@intel.com> References: <1549476133-9172-1-git-send-email-kevin.strasser@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1549476133-9172-1-git-send-email-kevin.strasser@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: David Airlie , Daniel Vetter , Uma Shankar List-Id: intel-gfx@lists.freedesktop.org Q2hhbmdlIHRoZSBhcGkgaW4gb3JkZXIgdG8gZW5hYmxlIGNhbGxlcnMgdGhhdCBjYW4ndCBzdXBw bHkgYSB2YWxpZAppbnRlbF9wbGFuZSBwb2ludGVyLCBhcyB3b3VsZCBiZSB0aGUgY2FzZSBwcmlv ciB0byBjYWxsaW5nCmRybV91bml2ZXJzYWxfcGxhbmVfaW5pdC4KCnY0OgotIFJlbmFtZSB2YXJp YWJsZXMgYW5kIG1vdmUgYSBkZWNsYXJhdGlvbiAoVmlsbGUpCgpDYzogVW1hIFNoYW5rYXIgPHVt YS5zaGFua2FyQGludGVsLmNvbT4KQ2M6IFNoYXNoYW5rIFNoYXJtYSA8c2hhc2hhbmsuc2hhcm1h QGludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpTaWduZWQtb2ZmLWJ5OiBLZXZpbiBTdHJhc3NlciA8a2V2aW4uc3RyYXNzZXJAaW50 ZWwuY29tPgpSZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyAgfCAz ICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNSArKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgNyArKysrLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCA2ICsrKy0tLQogNCBmaWxlcyBjaGFuZ2VkLCAx MiBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRv bWljLmMKaW5kZXggMTYyNjNhZC4uZDg0NTk1MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRv bWljLmMKQEAgLTIzMiwxMCArMjMyLDExIEBAIHN0YXRpYyB2b2lkIGludGVsX2F0b21pY19zZXR1 cF9zY2FsZXIoc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpzY2FsZXJfc3RhCiAJaWYg KHBsYW5lX3N0YXRlICYmIHBsYW5lX3N0YXRlLT5iYXNlLmZiICYmCiAJICAgIHBsYW5lX3N0YXRl LT5iYXNlLmZiLT5mb3JtYXQtPmlzX3l1diAmJgogCSAgICBwbGFuZV9zdGF0ZS0+YmFzZS5mYi0+ Zm9ybWF0LT5udW1fcGxhbmVzID4gMSkgeworCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0g dG9faW50ZWxfcGxhbmUocGxhbmVfc3RhdGUtPmJhc2UucGxhbmUpOwogCQlpZiAoSVNfR0VOKGRl dl9wcml2LCA5KSAmJgogCQkgICAgIUlTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKSB7CiAJCQltb2Rl ID0gU0tMX1BTX1NDQUxFUl9NT0RFX05WMTI7Ci0JCX0gZWxzZSBpZiAoaWNsX2lzX2hkcl9wbGFu ZSh0b19pbnRlbF9wbGFuZShwbGFuZV9zdGF0ZS0+YmFzZS5wbGFuZSkpKSB7CisJCX0gZWxzZSBp ZiAoaWNsX2lzX2hkcl9wbGFuZShkZXZfcHJpdiwgcGxhbmUtPmlkKSkgewogCQkJLyoKIAkJCSAq IE9uIGdlbjExKydzIEhEUiBwbGFuZXMgd2Ugb25seSB1c2UgdGhlIHNjYWxlciBmb3IKIAkJCSAq IHNjYWxpbmcuIFRoZXkgaGF2ZSBhIGRlZGljYXRlZCBjaHJvbWEgdXBzYW1wbGVyLCBzbwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDRkNWVjOTIuLjJkOTYzOWQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTM3MjYsNyArMzcyNiw3IEBAIHUzMiBn bGtfcGxhbmVfY29sb3JfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLAogCXBsYW5lX2NvbG9yX2N0bCB8PSBQTEFORV9DT0xPUl9QTEFORV9HQU1NQV9ESVNBQkxF OwogCXBsYW5lX2NvbG9yX2N0bCB8PSBnbGtfcGxhbmVfY29sb3JfY3RsX2FscGhhKHBsYW5lX3N0 YXRlKTsKIAotCWlmIChmYi0+Zm9ybWF0LT5pc195dXYgJiYgIWljbF9pc19oZHJfcGxhbmUocGxh bmUpKSB7CisJaWYgKGZiLT5mb3JtYXQtPmlzX3l1diAmJiAhaWNsX2lzX2hkcl9wbGFuZShkZXZf cHJpdiwgcGxhbmUtPmlkKSkgewogCQlpZiAocGxhbmVfc3RhdGUtPmJhc2UuY29sb3JfZW5jb2Rp bmcgPT0gRFJNX0NPTE9SX1lDQkNSX0JUNzA5KQogCQkJcGxhbmVfY29sb3JfY3RsIHw9IFBMQU5F X0NPTE9SX0NTQ19NT0RFX1lVVjcwOV9UT19SR0I3MDk7CiAJCWVsc2UKQEAgLTUwNTIsMTMgKzUw NTIsMTQgQEAgc3RhdGljIGludCBza2xfdXBkYXRlX3NjYWxlcl9wbGFuZShzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3Bs YW5lID0KIAkJdG9faW50ZWxfcGxhbmUocGxhbmVfc3RhdGUtPmJhc2UucGxhbmUpOworCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfcGxhbmUtPmJhc2Uu ZGV2KTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNlLmZi OwogCWludCByZXQ7CiAJYm9vbCBmb3JjZV9kZXRhY2ggPSAhZmIgfHwgIXBsYW5lX3N0YXRlLT5i YXNlLnZpc2libGU7CiAJYm9vbCBuZWVkX3NjYWxlciA9IGZhbHNlOwogCiAJLyogUHJlLWdlbjEx IGFuZCBTRFIgcGxhbmVzIGFsd2F5cyBuZWVkIGEgc2NhbGVyIGZvciBwbGFuYXIgZm9ybWF0cy4g Ki8KLQlpZiAoIWljbF9pc19oZHJfcGxhbmUoaW50ZWxfcGxhbmUpICYmCisJaWYgKCFpY2xfaXNf aGRyX3BsYW5lKGRldl9wcml2LCBpbnRlbF9wbGFuZS0+aWQpICYmCiAJICAgIGZiICYmIGZiLT5m b3JtYXQtPmZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpCiAJCW5lZWRfc2NhbGVyID0gdHJ1ZTsK IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA5MGJhNTQzLi5lN2ZiMjc4IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMjMxMywxMiArMjMxMywxMyBAQCBzdGF0aWMgaW5saW5l IGJvb2wgaWNsX2lzX252MTJfeV9wbGFuZShlbnVtIHBsYW5lX2lkIGlkKQogCXJldHVybiBmYWxz ZTsKIH0KIAotc3RhdGljIGlubGluZSBib29sIGljbF9pc19oZHJfcGxhbmUoc3RydWN0IGludGVs X3BsYW5lICpwbGFuZSkKK3N0YXRpYyBpbmxpbmUgYm9vbCBpY2xfaXNfaGRyX3BsYW5lKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKKwkJCQkgICAgZW51bSBwbGFuZV9pZCBwbGFu ZV9pZCkKIHsKLQlpZiAoSU5URUxfR0VOKHRvX2k5MTUocGxhbmUtPmJhc2UuZGV2KSkgPCAxMSkK KwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDExKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlyZXR1 cm4gcGxhbmUtPmlkIDwgUExBTkVfU1BSSVRFMjsKKwlyZXR1cm4gcGxhbmVfaWQgPCBQTEFORV9T UFJJVEUyOwogfQogCiAvKiBpbnRlbF90di5jICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jCmluZGV4IGNkNDJlODEuLjEwYjM3ZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jCkBAIC0zMzYsNyArMzM2LDcgQEAgc2tsX3Byb2dyYW1fc2NhbGVyKHN0cnVjdCBpbnRlbF9w bGFuZSAqcGxhbmUsCiAKIAkvKiBUT0RPOiBoYW5kbGUgc3ViLXBpeGVsIGNvb3JkaW5hdGVzICov CiAJaWYgKHBsYW5lX3N0YXRlLT5iYXNlLmZiLT5mb3JtYXQtPmZvcm1hdCA9PSBEUk1fRk9STUFU X05WMTIgJiYKLQkgICAgIWljbF9pc19oZHJfcGxhbmUocGxhbmUpKSB7CisJICAgICFpY2xfaXNf aGRyX3BsYW5lKGRldl9wcml2LCBwbGFuZS0+aWQpKSB7CiAJCXlfaHBoYXNlID0gc2tsX3NjYWxl cl9jYWxjX3BoYXNlKDEsIGhzY2FsZSwgZmFsc2UpOwogCQl5X3ZwaGFzZSA9IHNrbF9zY2FsZXJf Y2FsY19waGFzZSgxLCB2c2NhbGUsIGZhbHNlKTsKIApAQCAtNTExLDcgKzUxMSw3IEBAIHNrbF9w cm9ncmFtX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJSTkxNV9XUklURV9GVyhQ TEFORV9BVVhfRElTVChwaXBlLCBwbGFuZV9pZCksCiAJCSAgICAgIChwbGFuZV9zdGF0ZS0+Y29s b3JfcGxhbmVbMV0ub2Zmc2V0IC0gc3VyZl9hZGRyKSB8IGF1eF9zdHJpZGUpOwogCi0JaWYgKGlj bF9pc19oZHJfcGxhbmUocGxhbmUpKSB7CisJaWYgKGljbF9pc19oZHJfcGxhbmUoZGV2X3ByaXYs IHBsYW5lX2lkKSkgewogCQl1MzIgY3VzX2N0bCA9IDA7CiAKIAkJaWYgKGxpbmtlZCkgewpAQCAt NTM2LDcgKzUzNiw3IEBAIHNrbF9wcm9ncmFtX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxh bmUsCiAJCUk5MTVfV1JJVEVfRlcoUExBTkVfQ09MT1JfQ1RMKHBpcGUsIHBsYW5lX2lkKSwKIAkJ CSAgICAgIHBsYW5lX3N0YXRlLT5jb2xvcl9jdGwpOwogCi0JaWYgKGZiLT5mb3JtYXQtPmlzX3l1 diAmJiBpY2xfaXNfaGRyX3BsYW5lKHBsYW5lKSkKKwlpZiAoZmItPmZvcm1hdC0+aXNfeXV2ICYm IGljbF9pc19oZHJfcGxhbmUoZGV2X3ByaXYsIHBsYW5lX2lkKSkKIAkJaWNsX3Byb2dyYW1faW5w dXRfY3NjKHBsYW5lLCBjcnRjX3N0YXRlLCBwbGFuZV9zdGF0ZSk7CiAKIAlza2xfd3JpdGVfcGxh bmVfd20ocGxhbmUsIGNydGNfc3RhdGUpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=