From: Rodrigo Siqueira Subject: [PATCH 23/30] drm/amd/display: Avoid conflict between HDR multiplier and 3dlut Date: Mon, 11 Nov 2019 19:33:17 -0500 Message-ID: <20191112003324.8419-24-Rodrigo.Siqueira@amd.com> References: <20191112003324.8419-1-Rodrigo.Siqueira@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191112003324.8419-1-Rodrigo.Siqueira-5C7GfCeVMHo@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Krunoslav Kovac , Michael Strauss RnJvbTogTWljaGFlbCBTdHJhdXNzIDxtaWNoYWVsLnN0cmF1c3NAYW1kLmNvbT4KCltXSFldClRo ZXJlIGNhbiBiZSBhIGNvbmZsaWN0IGJldHdlZW4gT1MgSERSIG11bHRpcGxpZXIgYW5kIDNkbHV0 IEhEUgptdWx0aXBsaWVyLCB3aGljaCBhcmUgYm90aCBzZW50IHRvIERDLgoKW0hPV10KSW5zdGVh ZCBvZiBoYXZpbmcgZGMgZGV0ZXJtaW5lIHdoaWNoIEhEUiBtdWx0aXBsaWVyIHRvIHVzZSwgbWFr ZSB0aGUKZGVjaXNpb24gaW4gZG0gYW5kIHNlbmQgb25seSB0aGUgaW50ZW5kZWQgdmFsdWUgaW4g YSBzdXJmYWNlIHVwZGF0ZS4KU3RvcmUgdGhlIGN1cnJlbnQgT1MgSERSIG11bHRpcGxpZXIgYW5k IGRldGVybWluZSB3aGV0aGVyIHRvIHVzZSBpdCBvcgp0aGUgM2RsdXQncyBtdWx0aXBsaWVyIGJl Zm9yZSBzZW5kaW5nIHRoZSBzdXJmYWNlIHVwZGF0ZSB0byBkYy4gU2VuZAptdWx0aXBsaWVyIHRv IGRjIGluIGZpeGVkMzFfMzIgZm9ybWF0LCBkYyB0aGVuIGNvbnZlcnRzIGl0IHRvIGh3IGZvcm1h dC4KClNpZ25lZC1vZmYtYnk6IE1pY2hhZWwgU3RyYXVzcyA8bWljaGFlbC5zdHJhdXNzQGFtZC5j b20+ClJldmlld2VkLWJ5OiBLcnVub3NsYXYgS292YWMgPEtydW5vc2xhdi5Lb3ZhY0BhbWQuY29t PgpBY2tlZC1ieTogUm9kcmlnbyBTaXF1ZWlyYSA8Um9kcmlnby5TaXF1ZWlyYUBhbWQuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMgICAgICAgIHwgMTcg KysrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oICAg ICAgICAgICAgIHwgIDkgKysrKy0tLS0tCiAuLi4vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBf aHdfc2VxdWVuY2VyLmMgICB8IDEwICsrKysrKystLS0KIC4uLi9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjIwL2RjbjIwX2h3c2VxLmMgIHwgMTAgKy0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2Vk LCAyMiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2NvcmUvZGMuYwppbmRleCBkMDc5ZmZhZGFlYjQuLjA0YWYyYmY2MDA3MyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jCkBAIC0xNDY5LDExICsxNDY5 LDYgQEAgc3RhdGljIGVudW0gc3VyZmFjZV91cGRhdGVfdHlwZSBnZXRfcGxhbmVfaW5mb191cGRh dGVfdHlwZShjb25zdCBzdHJ1Y3QgZGNfc3VyZmEKIAkJZWxldmF0ZV91cGRhdGVfdHlwZSgmdXBk YXRlX3R5cGUsIFVQREFURV9UWVBFX01FRCk7CiAJfQogCi0JaWYgKHUtPnBsYW5lX2luZm8tPnNk cl93aGl0ZV9sZXZlbCAhPSB1LT5zdXJmYWNlLT5zZHJfd2hpdGVfbGV2ZWwpIHsKLQkJdXBkYXRl X2ZsYWdzLT5iaXRzLnNkcl93aGl0ZV9sZXZlbCA9IDE7Ci0JCWVsZXZhdGVfdXBkYXRlX3R5cGUo JnVwZGF0ZV90eXBlLCBVUERBVEVfVFlQRV9NRUQpOwotCX0KLQogCWlmICh1LT5wbGFuZV9pbmZv LT5kY2MuZW5hYmxlICE9IHUtPnN1cmZhY2UtPmRjYy5lbmFibGUKIAkJCXx8IHUtPnBsYW5lX2lu Zm8tPmRjYy5pbmRlcGVuZGVudF82NGJfYmxrcyAhPSB1LT5zdXJmYWNlLT5kY2MuaW5kZXBlbmRl bnRfNjRiX2Jsa3MKIAkJCXx8IHUtPnBsYW5lX2luZm8tPmRjYy5tZXRhX3BpdGNoICE9IHUtPnN1 cmZhY2UtPmRjYy5tZXRhX3BpdGNoKSB7CkBAIC0xNjIxLDYgKzE2MTYsMTIgQEAgc3RhdGljIGVu dW0gc3VyZmFjZV91cGRhdGVfdHlwZSBkZXRfc3VyZmFjZV91cGRhdGUoY29uc3Qgc3RydWN0IGRj ICpkYywKIAkJCXVwZGF0ZV9mbGFncy0+Yml0cy5nYW1tYV9jaGFuZ2UgPSAxOwogCX0KIAorCWlm ICh1LT5oZHJfbXVsdC52YWx1ZSkKKwkJaWYgKHUtPmhkcl9tdWx0LnZhbHVlICE9IHUtPnN1cmZh Y2UtPmhkcl9tdWx0LnZhbHVlKSB7CisJCQl1cGRhdGVfZmxhZ3MtPmJpdHMuaGRyX211bHQgPSAx OworCQkJZWxldmF0ZV91cGRhdGVfdHlwZSgmb3ZlcmFsbF90eXBlLCBVUERBVEVfVFlQRV9NRUQp OworCQl9CisKIAlpZiAodXBkYXRlX2ZsYWdzLT5iaXRzLmluX3RyYW5zZmVyX2Z1bmNfY2hhbmdl KSB7CiAJCXR5cGUgPSBVUERBVEVfVFlQRV9NRUQ7CiAJCWVsZXZhdGVfdXBkYXRlX3R5cGUoJm92 ZXJhbGxfdHlwZSwgdHlwZSk7CkBAIC0xODAyLDggKzE4MDMsNiBAQCBzdGF0aWMgdm9pZCBjb3B5 X3N1cmZhY2VfdXBkYXRlX3RvX3BsYW5lKAogCQkJCXNyZl91cGRhdGUtPnBsYW5lX2luZm8tPmds b2JhbF9hbHBoYV92YWx1ZTsKIAkJc3VyZmFjZS0+ZGNjID0KIAkJCQlzcmZfdXBkYXRlLT5wbGFu ZV9pbmZvLT5kY2M7Ci0JCXN1cmZhY2UtPnNkcl93aGl0ZV9sZXZlbCA9Ci0JCQkJc3JmX3VwZGF0 ZS0+cGxhbmVfaW5mby0+c2RyX3doaXRlX2xldmVsOwogCQlzdXJmYWNlLT5sYXllcl9pbmRleCA9 CiAJCQkJc3JmX3VwZGF0ZS0+cGxhbmVfaW5mby0+bGF5ZXJfaW5kZXg7CiAJfQpAQCAtMTg0OCw2 ICsxODQ3LDEwIEBAIHN0YXRpYyB2b2lkIGNvcHlfc3VyZmFjZV91cGRhdGVfdG9fcGxhbmUoCiAJ CW1lbWNweShzdXJmYWNlLT5sdXQzZF9mdW5jLCBzcmZfdXBkYXRlLT5sdXQzZF9mdW5jLAogCQlz aXplb2YoKnN1cmZhY2UtPmx1dDNkX2Z1bmMpKTsKIAorCWlmIChzcmZfdXBkYXRlLT5oZHJfbXVs dC52YWx1ZSkKKwkJc3VyZmFjZS0+aGRyX211bHQgPQorCQkJCXNyZl91cGRhdGUtPmhkcl9tdWx0 OworCiAJaWYgKHNyZl91cGRhdGUtPmJsZW5kX3RmICYmCiAJCQkoc3VyZmFjZS0+YmxlbmRfdGYg IT0KIAkJCXNyZl91cGRhdGUtPmJsZW5kX3RmKSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9kYy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2Rj LmgKaW5kZXggZGE5Y2I3ZGQyMmU2Li4zY2IzNjE5MTdiNGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9kYy5oCkBAIC02NjcsNyArNjY3LDcgQEAgdW5pb24gZGNfM2RsdXRfc3RhdGUgewog c3RydWN0IGRjXzNkbHV0IHsKIAlzdHJ1Y3Qga3JlZiByZWZjb3VudDsKIAlzdHJ1Y3QgdGV0cmFo ZWRyYWxfcGFyYW1zIGx1dF8zZDsKLQl1aW50MzJfdCBoZHJfbXVsdGlwbGllcjsKKwlzdHJ1Y3Qg Zml4ZWQzMV8zMiBoZHJfbXVsdGlwbGllcjsKIAlib29sIGluaXRpYWxpemVkOyAvKnJlbW92ZSBh ZnRlciBkaWFnIGZpeCovCiAJdW5pb24gZGNfM2RsdXRfc3RhdGUgc3RhdGU7CiAJc3RydWN0IGRj X2NvbnRleHQgKmN0eDsKQEAgLTY5NCw3ICs2OTQsNyBAQCB1bmlvbiBzdXJmYWNlX3VwZGF0ZV9m bGFncyB7CiAJCXVpbnQzMl90IGhvcml6b250YWxfbWlycm9yX2NoYW5nZToxOwogCQl1aW50MzJf dCBwZXJfcGl4ZWxfYWxwaGFfY2hhbmdlOjE7CiAJCXVpbnQzMl90IGdsb2JhbF9hbHBoYV9jaGFu Z2U6MTsKLQkJdWludDMyX3Qgc2RyX3doaXRlX2xldmVsOjE7CisJCXVpbnQzMl90IGhkcl9tdWx0 OjE7CiAJCXVpbnQzMl90IHJvdGF0aW9uX2NoYW5nZToxOwogCQl1aW50MzJfdCBzd2l6emxlX2No YW5nZToxOwogCQl1aW50MzJfdCBzY2FsaW5nX2NoYW5nZToxOwpAQCAtNzM4LDcgKzczOCw3IEBA IHN0cnVjdCBkY19wbGFuZV9zdGF0ZSB7CiAJc3RydWN0IGRjX2JpYXNfYW5kX3NjYWxlICpiaWFz X2FuZF9zY2FsZTsKIAlzdHJ1Y3QgZGNfY3NjX3RyYW5zZm9ybSBpbnB1dF9jc2NfY29sb3JfbWF0 cml4OwogCXN0cnVjdCBmaXhlZDMxXzMyIGNvZWZmX3JlZHVjdGlvbl9mYWN0b3I7Ci0JdWludDMy X3Qgc2RyX3doaXRlX2xldmVsOworCXN0cnVjdCBmaXhlZDMxXzMyIGhkcl9tdWx0OwogCiAJLy8g VE9ETzogTm8gbG9uZ2VyIHVzZWQsIHJlbW92ZQogCXN0cnVjdCBkY19oZHJfc3RhdGljX21ldGFk YXRhIGhkcl9zdGF0aWNfY3R4OwpAQCAtNzgzLDcgKzc4Myw2IEBAIHN0cnVjdCBkY19wbGFuZV9p bmZvIHsKIAllbnVtIGRjX3JvdGF0aW9uX2FuZ2xlIHJvdGF0aW9uOwogCWVudW0gcGxhbmVfc3Rl cmVvX2Zvcm1hdCBzdGVyZW9fZm9ybWF0OwogCWVudW0gZGNfY29sb3Jfc3BhY2UgY29sb3Jfc3Bh Y2U7Ci0JdW5zaWduZWQgaW50IHNkcl93aGl0ZV9sZXZlbDsKIAlib29sIGhvcml6b250YWxfbWly cm9yOwogCWJvb2wgdmlzaWJsZTsKIAlib29sIHBlcl9waXhlbF9hbHBoYTsKQEAgLTgwNyw3ICs4 MDYsNyBAQCBzdHJ1Y3QgZGNfc3VyZmFjZV91cGRhdGUgewogCWNvbnN0IHN0cnVjdCBkY19mbGlw X2FkZHJzICpmbGlwX2FkZHI7CiAJY29uc3Qgc3RydWN0IGRjX3BsYW5lX2luZm8gKnBsYW5lX2lu Zm87CiAJY29uc3Qgc3RydWN0IGRjX3NjYWxpbmdfaW5mbyAqc2NhbGluZ19pbmZvOwotCisJc3Ry dWN0IGZpeGVkMzFfMzIgaGRyX211bHQ7CiAJLyogZm9sbG93aW5nIHVwZGF0ZXMgcmVxdWlyZSBh bGxvYy9zbGVlcC9zcGluIHRoYXQgaXMgbm90IGlzciBzYWZlLAogCSAqIG51bGwgbWVhbnMgbm8g dXBkYXRlcwogCSAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jCmluZGV4IGFkYmE3NjdjY2YyZS4uZjIxYTM4 NWE5MzZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAv ZGNuMTBfaHdfc2VxdWVuY2VyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jCkBAIC0yNDU3LDE2ICsyNDU3LDIwIEBAIHN0YXRp YyB2b2lkIGRjbjEwX2JsYW5rX3BpeGVsX2RhdGEoCiAKIHZvaWQgc2V0X2hkcl9tdWx0aXBsaWVy KHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgpCiB7Ci0Jc3RydWN0IGZpeGVkMzFfMzIgbXVsdGlw bGllciA9IGRjX2ZpeHB0X2Zyb21fZnJhY3Rpb24oCi0JCQlwaXBlX2N0eC0+cGxhbmVfc3RhdGUt PnNkcl93aGl0ZV9sZXZlbCwgODApOworCXN0cnVjdCBmaXhlZDMxXzMyIG11bHRpcGxpZXIgPSBw aXBlX2N0eC0+cGxhbmVfc3RhdGUtPmhkcl9tdWx0OwogCXVpbnQzMl90IGh3X211bHQgPSAweDFm MDAwOyAvLyAxLjAgZGVmYXVsdCBtdWx0aXBsaWVyCiAJc3RydWN0IGN1c3RvbV9mbG9hdF9mb3Jt YXQgZm10OworCWJvb2wgbXVsdF9uZWdhdGl2ZTsgLy8gVHJ1ZSBpZiBmaXhlZDMxXzMyIHNpZ24g Yml0IGluZGljYXRlcyBuZWdhdGl2ZSB2YWx1ZQorCXVpbnQzMl90IG11bHRfaW50OyAvLyBpbnQg Y29tcG9uZW50IG9mIGZpeGVkMzFfMzIKIAogCWZtdC5leHBvbmVudGFfYml0cyA9IDY7CiAJZm10 Lm1hbnRpc3NhX2JpdHMgPSAxMjsKIAlmbXQuc2lnbiA9IHRydWU7CiAKLQlpZiAocGlwZV9jdHgt PnBsYW5lX3N0YXRlLT5zZHJfd2hpdGVfbGV2ZWwgPiA4MCkKKwltdWx0X25lZ2F0aXZlID0gbXVs dGlwbGllci52YWx1ZSA+PiA2MyAhPSAwOworCW11bHRfaW50ID0gbXVsdGlwbGllci52YWx1ZSA+ PiAzMjsKKworCWlmIChtdWx0X2ludCAmJiAhbXVsdF9uZWdhdGl2ZSkgLy8gQ2hlY2sgaWYgZ3Jl YXRlciB0aGFuIDEKIAkJY29udmVydF90b19jdXN0b21fZmxvYXRfZm9ybWF0KG11bHRpcGxpZXIs ICZmbXQsICZod19tdWx0KTsKIAogCXBpcGVfY3R4LT5wbGFuZV9yZXMuZHBwLT5mdW5jcy0+ZHBw X3NldF9oZHJfbXVsdGlwbGllcigKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9kY24yMC9kY24yMF9od3NlcS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2RjL2RjbjIwL2RjbjIwX2h3c2VxLmMKaW5kZXggNGQzNmI5ZTQxNWYxLi44NjgwOTlmYmU4YmEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24yMC9kY24yMF9o d3NlcS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24yMC9kY24yMF9o d3NlcS5jCkBAIC03MzQsMTQgKzczNCw2IEBAIGJvb2wgZGNuMjBfc2V0X3NoYXBlcl8zZGx1dCgK IAllbHNlCiAJCXJlc3VsdCA9IGRwcF9iYXNlLT5mdW5jcy0+ZHBwX3Byb2dyYW1fM2RsdXQoZHBw X2Jhc2UsIE5VTEwpOwogCi0JaWYgKHBsYW5lX3N0YXRlLT5sdXQzZF9mdW5jICYmCi0JCXBsYW5l X3N0YXRlLT5sdXQzZF9mdW5jLT5zdGF0ZS5iaXRzLmluaXRpYWxpemVkID09IDEgJiYKLQkJcGxh bmVfc3RhdGUtPmx1dDNkX2Z1bmMtPmhkcl9tdWx0aXBsaWVyICE9IDApCi0JCWRwcF9iYXNlLT5m dW5jcy0+ZHBwX3NldF9oZHJfbXVsdGlwbGllcihkcHBfYmFzZSwKLQkJCQlwbGFuZV9zdGF0ZS0+ bHV0M2RfZnVuYy0+aGRyX211bHRpcGxpZXIpOwotCWVsc2UKLQkJZHBwX2Jhc2UtPmZ1bmNzLT5k cHBfc2V0X2hkcl9tdWx0aXBsaWVyKGRwcF9iYXNlLCAweDFmMDAwKTsKLQogCXJldHVybiByZXN1 bHQ7CiB9CiAKQEAgLTEzODIsNyArMTM3NCw3IEBAIHN0YXRpYyB2b2lkIGRjbjIwX3Byb2dyYW1f cGlwZSgKIAkJZGNuMjBfdXBkYXRlX2RjaHVicF9kcHAoZGMsIHBpcGVfY3R4LCBjb250ZXh0KTsK IAogCWlmIChwaXBlX2N0eC0+dXBkYXRlX2ZsYWdzLmJpdHMuZW5hYmxlCi0JCQl8fCBwaXBlX2N0 eC0+cGxhbmVfc3RhdGUtPnVwZGF0ZV9mbGFncy5iaXRzLnNkcl93aGl0ZV9sZXZlbCkKKwkJCXx8 IHBpcGVfY3R4LT5wbGFuZV9zdGF0ZS0+dXBkYXRlX2ZsYWdzLmJpdHMuaGRyX211bHQpCiAJCXNl dF9oZHJfbXVsdGlwbGllcihwaXBlX2N0eCk7CiAKIAlpZiAocGlwZV9jdHgtPnVwZGF0ZV9mbGFn cy5iaXRzLmVuYWJsZSB8fAotLSAKMi4yNC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZng=