From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Strasser Subject: [PATCH v6 2/3] drm/i915: Refactor icl_is_hdr_plane Date: Tue, 12 Mar 2019 17:38:31 -0700 Message-ID: <1552437513-22648-3-git-send-email-kevin.strasser@intel.com> References: <1552437513-22648-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: <1552437513-22648-1-git-send-email-kevin.strasser@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: David Airlie , Daniel Vetter , Adam Jackson List-Id: dri-devel@lists.freedesktop.org Q2hhbmdlIHRoZSBhcGkgaW4gb3JkZXIgdG8gZW5hYmxlIGNhbGxlcnMgdGhhdCBjYW4ndCBzdXBw bHkgYSB2YWxpZAppbnRlbF9wbGFuZSBwb2ludGVyLCBhcyB3b3VsZCBiZSB0aGUgY2FzZSBwcmlv ciB0byBjYWxsaW5nCmRybV91bml2ZXJzYWxfcGxhbmVfaW5pdC4KCnY0OgotIFJlbmFtZSB2YXJp YWJsZXMgYW5kIG1vdmUgYSBkZWNsYXJhdGlvbiAoVmlsbGUpCgp2NjoKLSBSZWJhc2UgYW5kIGZp eCBtZXJnZSBjb25mbGljdAoKQ2M6IFVtYSBTaGFua2FyIDx1bWEuc2hhbmthckBpbnRlbC5jb20+ CkNjOiBTaGFzaGFuayBTaGFybWEgPHNoYXNoYW5rLnNoYXJtYUBpbnRlbC5jb20+CkNjOiBEYXZp ZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0 dGVyQGZmd2xsLmNoPgpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpTaWduZWQt b2ZmLWJ5OiBLZXZpbiBTdHJhc3NlciA8a2V2aW4uc3RyYXNzZXJAaW50ZWwuY29tPgpSZXZpZXdl ZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KUmV2 aWV3ZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRl bC5jb20+ClJldmlld2VkLWJ5OiBBZGFtIEphY2tzb24gPGFqYXhAcmVkaGF0LmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyAgfCAzICsrLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNyArKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCAgICAgfCA3ICsrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Nwcml0ZS5jICB8IDYgKysrLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyks IDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf YXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwppbmRleCBkYTQx OWUxLi5iODQ0ZTg4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwpAQCAtMjM1LDEw ICsyMzUsMTEgQEAgc3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcihzdHJ1Y3Qg aW50ZWxfY3J0Y19zY2FsZXJfc3RhdGUgKnNjYWxlcl9zdGEKIAlpZiAocGxhbmVfc3RhdGUgJiYg cGxhbmVfc3RhdGUtPmJhc2UuZmIgJiYKIAkgICAgcGxhbmVfc3RhdGUtPmJhc2UuZmItPmZvcm1h dC0+aXNfeXV2ICYmCiAJICAgIHBsYW5lX3N0YXRlLT5iYXNlLmZiLT5mb3JtYXQtPm51bV9wbGFu ZXMgPiAxKSB7CisJCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFuZShw bGFuZV9zdGF0ZS0+YmFzZS5wbGFuZSk7CiAJCWlmIChJU19HRU4oZGV2X3ByaXYsIDkpICYmCiAJ CSAgICAhSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKIAkJCW1vZGUgPSBTS0xfUFNfU0NBTEVS X01PREVfTlYxMjsKLQkJfSBlbHNlIGlmIChpY2xfaXNfaGRyX3BsYW5lKHRvX2ludGVsX3BsYW5l KHBsYW5lX3N0YXRlLT5iYXNlLnBsYW5lKSkpIHsKKwkJfSBlbHNlIGlmIChpY2xfaXNfaGRyX3Bs YW5lKGRldl9wcml2LCBwbGFuZS0+aWQpKSB7CiAJCQkvKgogCQkJICogT24gZ2VuMTErJ3MgSERS IHBsYW5lcyB3ZSBvbmx5IHVzZSB0aGUgc2NhbGVyIGZvcgogCQkJICogc2NhbGluZy4gVGhleSBo YXZlIGEgZGVkaWNhdGVkIGNocm9tYSB1cHNhbXBsZXIsIHNvCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKaW5kZXggZDExY2VjMS4uNjBmYmUzYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwpAQCAtMzc4MSw2ICszNzgxLDggQEAgdTMyIGdsa19wbGFuZV9jb2xvcl9j dGxfY3J0Yyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHUzMiBn bGtfcGxhbmVfY29sb3JfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlLAogCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPQorCQl0b19pOTE1KHBsYW5lX3N0 YXRlLT5iYXNlLnBsYW5lLT5kZXYpOwogCWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi ID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7CiAJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSA9IHRv X2ludGVsX3BsYW5lKHBsYW5lX3N0YXRlLT5iYXNlLnBsYW5lKTsKIAl1MzIgcGxhbmVfY29sb3Jf Y3RsID0gMDsKQEAgLTM3ODgsNyArMzc5MCw3IEBAIHUzMiBnbGtfcGxhbmVfY29sb3JfY3RsKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXBsYW5lX2NvbG9yX2N0 bCB8PSBQTEFORV9DT0xPUl9QTEFORV9HQU1NQV9ESVNBQkxFOwogCXBsYW5lX2NvbG9yX2N0bCB8 PSBnbGtfcGxhbmVfY29sb3JfY3RsX2FscGhhKHBsYW5lX3N0YXRlKTsKIAotCWlmIChmYi0+Zm9y bWF0LT5pc195dXYgJiYgIWljbF9pc19oZHJfcGxhbmUocGxhbmUpKSB7CisJaWYgKGZiLT5mb3Jt YXQtPmlzX3l1diAmJiAhaWNsX2lzX2hkcl9wbGFuZShkZXZfcHJpdiwgcGxhbmUtPmlkKSkgewog CQlpZiAocGxhbmVfc3RhdGUtPmJhc2UuY29sb3JfZW5jb2RpbmcgPT0gRFJNX0NPTE9SX1lDQkNS X0JUNzA5KQogCQkJcGxhbmVfY29sb3JfY3RsIHw9IFBMQU5FX0NPTE9SX0NTQ19NT0RFX1lVVjcw OV9UT19SR0I3MDk7CiAJCWVsc2UKQEAgLTUxMDEsMTMgKzUxMDMsMTQgQEAgc3RhdGljIGludCBz a2xfdXBkYXRlX3NjYWxlcl9wbGFuZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSwKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0KIAkJdG9faW50ZWxfcGxh bmUocGxhbmVfc3RhdGUtPmJhc2UucGxhbmUpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfcGxhbmUtPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgZHJtX2Zy YW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNlLmZiOwogCWludCByZXQ7CiAJYm9vbCBm b3JjZV9kZXRhY2ggPSAhZmIgfHwgIXBsYW5lX3N0YXRlLT5iYXNlLnZpc2libGU7CiAJYm9vbCBu ZWVkX3NjYWxlciA9IGZhbHNlOwogCiAJLyogUHJlLWdlbjExIGFuZCBTRFIgcGxhbmVzIGFsd2F5 cyBuZWVkIGEgc2NhbGVyIGZvciBwbGFuYXIgZm9ybWF0cy4gKi8KLQlpZiAoIWljbF9pc19oZHJf cGxhbmUoaW50ZWxfcGxhbmUpICYmCisJaWYgKCFpY2xfaXNfaGRyX3BsYW5lKGRldl9wcml2LCBp bnRlbF9wbGFuZS0+aWQpICYmCiAJICAgIGZiICYmIGlzX3BsYW5hcl95dXZfZm9ybWF0KGZiLT5m b3JtYXQtPmZvcm1hdCkpCiAJCW5lZWRfc2NhbGVyID0gdHJ1ZTsKIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaAppbmRleCA0MGViYzk0Li5hMjZjMmNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aApAQCAtMjQzNiwxMiArMjQzNiwxMyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaWNsX2lzX252MTJf eV9wbGFuZShlbnVtIHBsYW5lX2lkIGlkKQogCXJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIGlu bGluZSBib29sIGljbF9pc19oZHJfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSkKK3N0 YXRpYyBpbmxpbmUgYm9vbCBpY2xfaXNfaGRyX3BsYW5lKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKKwkJCQkgICAgZW51bSBwbGFuZV9pZCBwbGFuZV9pZCkKIHsKLQlpZiAoSU5U RUxfR0VOKHRvX2k5MTUocGxhbmUtPmJhc2UuZGV2KSkgPCAxMSkKKwlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA8IDExKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlyZXR1cm4gcGxhbmUtPmlkIDwgUExB TkVfU1BSSVRFMjsKKwlyZXR1cm4gcGxhbmVfaWQgPCBQTEFORV9TUFJJVEUyOwogfQogCiAvKiBp bnRlbF90di5jICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDg5ZDdiZjcu LjYyMjY2OWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0zNDksNyArMzQ5 LDcgQEAgc2tsX3Byb2dyYW1fc2NhbGVyKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAKIAkv KiBUT0RPOiBoYW5kbGUgc3ViLXBpeGVsIGNvb3JkaW5hdGVzICovCiAJaWYgKGlzX3BsYW5hcl95 dXZfZm9ybWF0KHBsYW5lX3N0YXRlLT5iYXNlLmZiLT5mb3JtYXQtPmZvcm1hdCkgJiYKLQkgICAg IWljbF9pc19oZHJfcGxhbmUocGxhbmUpKSB7CisJICAgICFpY2xfaXNfaGRyX3BsYW5lKGRldl9w cml2LCBwbGFuZS0+aWQpKSB7CiAJCXlfaHBoYXNlID0gc2tsX3NjYWxlcl9jYWxjX3BoYXNlKDEs IGhzY2FsZSwgZmFsc2UpOwogCQl5X3ZwaGFzZSA9IHNrbF9zY2FsZXJfY2FsY19waGFzZSgxLCB2 c2NhbGUsIGZhbHNlKTsKIApAQCAtNTMxLDcgKzUzMSw3IEBAIHNrbF9wcm9ncmFtX3BsYW5lKHN0 cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJSTkxNV9XUklURV9GVyhQTEFORV9BVVhfRElTVChw aXBlLCBwbGFuZV9pZCksCiAJCSAgICAgIChwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMV0ub2Zm c2V0IC0gc3VyZl9hZGRyKSB8IGF1eF9zdHJpZGUpOwogCi0JaWYgKGljbF9pc19oZHJfcGxhbmUo cGxhbmUpKSB7CisJaWYgKGljbF9pc19oZHJfcGxhbmUoZGV2X3ByaXYsIHBsYW5lX2lkKSkgewog CQl1MzIgY3VzX2N0bCA9IDA7CiAKIAkJaWYgKGxpbmtlZCkgewpAQCAtNTU1LDcgKzU1NSw3IEBA IHNrbF9wcm9ncmFtX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPj0gMTAgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCiAJCUk5MTVf V1JJVEVfRlcoUExBTkVfQ09MT1JfQ1RMKHBpcGUsIHBsYW5lX2lkKSwgcGxhbmVfY29sb3JfY3Rs KTsKIAotCWlmIChmYi0+Zm9ybWF0LT5pc195dXYgJiYgaWNsX2lzX2hkcl9wbGFuZShwbGFuZSkp CisJaWYgKGZiLT5mb3JtYXQtPmlzX3l1diAmJiBpY2xfaXNfaGRyX3BsYW5lKGRldl9wcml2LCBw bGFuZV9pZCkpCiAJCWljbF9wcm9ncmFtX2lucHV0X2NzYyhwbGFuZSwgY3J0Y19zdGF0ZSwgcGxh bmVfc3RhdGUpOwogCiAJc2tsX3dyaXRlX3BsYW5lX3dtKHBsYW5lLCBjcnRjX3N0YXRlKTsKLS0g CjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=