From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 08/13] drm/i915: Populate gamma_mode for all platforms Date: Fri, 11 Jan 2019 19:08:18 +0200 Message-ID: <20190111170823.4441-9-ville.syrjala@linux.intel.com> References: <20190111170823.4441-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 941036F87F for ; Fri, 11 Jan 2019 17:08:57 +0000 (UTC) In-Reply-To: <20190111170823.4441-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IHByZS1IU1cgZ2FtbWEgbW9kZSBpcyBjb25maWd1cmVkIHZpYSBQSVBFQ09ORi4gVGhlIGJpdHMg YXJlCnRoZSBzYW1lIGV4Y2VwdCBzaGlmdGVkIHVwLCBzbyB3ZSBjYW4gcmV1c2UganVzdCBzdG9y ZSB0aGVtIGluCmNydGNfc3RhdGUtPmdhbW1hX21vZGUgaW4gdGhlIEhTVysgd2F5LCBhbGxvd2lu ZyB1cyB0byBzaGFyZQpzb21lIGNvZGUgbGF0ZXIuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcmVnLmggICAgICB8IDEwICsrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9jb2xvci5jICAgfCA2MCArKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxNCArKysrKystCiAzIGZpbGVzIGNoYW5n ZWQsIDY2IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oCmluZGV4IDQ0OTU4ZDk5NGJmYS4uOWQxN2JhMTk5YmU0IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKQEAgLTU1NzgsOSArNTU3OCwxNSBAQCBlbnVtIHsKICNkZWZpbmUgICBQSVBFQ09ORl9T SU5HTEVfV0lERQkwCiAjZGVmaW5lICAgUElQRUNPTkZfUElQRV9VTkxPQ0tFRCAwCiAjZGVmaW5l ICAgUElQRUNPTkZfUElQRV9MT0NLRUQJKDEgPDwgMjUpCi0jZGVmaW5lICAgUElQRUNPTkZfUEFM RVRURQkwCi0jZGVmaW5lICAgUElQRUNPTkZfR0FNTUEJCSgxIDw8IDI0KQogI2RlZmluZSAgIFBJ UEVDT05GX0ZPUkNFX0JPUkRFUgkoMSA8PCAyNSkKKyNkZWZpbmUgICBQSVBFQ09ORl9HQU1NQV9N T0RFX01BU0tfSTlYWAkoMSA8PCAyNCkgLyogZ21jaCAqLworI2RlZmluZSAgIFBJUEVDT05GX0dB TU1BX01PREVfTUFTS19JTEsJKDMgPDwgMjQpIC8qIGlsay1pdmIgKi8KKyNkZWZpbmUgICBQSVBF Q09ORl9HQU1NQV9NT0RFXzhCSVQJKDAgPDwgMjQpIC8qIGdtY2gsaWxrLWl2YiAqLworI2RlZmlu ZSAgIFBJUEVDT05GX0dBTU1BX01PREVfMTBCSVQJKDEgPDwgMjQpIC8qIGdtY2gsaWxrLWl2YiAq LworI2RlZmluZSAgIFBJUEVDT05GX0dBTU1BX01PREVfMTJCSVQJKDIgPDwgMjQpIC8qIGlsay1p dmIgKi8KKyNkZWZpbmUgICBQSVBFQ09ORl9HQU1NQV9NT0RFX1NQTElUCSgzIDw8IDI0KSAvKiBp dmIgKi8KKyNkZWZpbmUgICBQSVBFQ09ORl9HQU1NQV9NT0RFKHgpCSgoeCk8PDI0KSAvKiBwYXNz IGluIEdBTU1BX01PREVfTU9ERV8qICovCisjZGVmaW5lICAgUElQRUNPTkZfR0FNTUFfTU9ERV9T SElGVAkyNAogI2RlZmluZSAgIFBJUEVDT05GX0lOVEVSTEFDRV9NQVNLCSg3IDw8IDIxKQogI2Rl ZmluZSAgIFBJUEVDT05GX0lOVEVSTEFDRV9NQVNLX0hTVwkoMyA8PCAyMSkKIC8qIE5vdGUgdGhh dCBwcmUtZ2VuMyBkb2VzIG5vdCBzdXBwb3J0IGludGVybGFjZWQgZGlzcGxheSBkaXJlY3RseS4g UGFuZWwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCmluZGV4IDBjMGRhN2VkMGZkNy4uNmZk YmZhOGM0MDA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMKQEAgLTM1MSw2ICszNTEs MzIgQEAgc3RhdGljIHZvaWQgaTl4eF9sb2FkX2x1dHMoY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpCiAJaTl4eF9sb2FkX2x1dHNfaW50ZXJuYWwoY3J0Y19zdGF0ZSwg Y3J0Y19zdGF0ZS0+YmFzZS5nYW1tYV9sdXQpOwogfQogCitzdGF0aWMgdm9pZCBpOXh4X2NvbG9y X2NvbW1pdChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwlz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5j cnRjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMt PmJhc2UuZGV2KTsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CisJdTMyIHZhbDsKKwor CXZhbCA9IEk5MTVfUkVBRChQSVBFQ09ORihwaXBlKSk7CisJdmFsICY9IH5QSVBFQ09ORl9HQU1N QV9NT0RFX01BU0tfSTlYWDsKKwl2YWwgfD0gUElQRUNPTkZfR0FNTUFfTU9ERShjcnRjX3N0YXRl LT5nYW1tYV9tb2RlKTsKKwlJOTE1X1dSSVRFKFBJUEVDT05GKHBpcGUpLCB2YWwpOworfQorCitz dGF0aWMgdm9pZCBpbGtfY29sb3JfY29tbWl0KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlKQoreworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0 YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCWVudW0gcGlwZSBwaXBlID0gY3J0Yy0+ cGlwZTsKKwl1MzIgdmFsOworCisJdmFsID0gSTkxNV9SRUFEKFBJUEVDT05GKHBpcGUpKTsKKwl2 YWwgJj0gflBJUEVDT05GX0dBTU1BX01PREVfTUFTS19JTEs7CisJdmFsIHw9IFBJUEVDT05GX0dB TU1BX01PREUoY3J0Y19zdGF0ZS0+Z2FtbWFfbW9kZSk7CisJSTkxNV9XUklURShQSVBFQ09ORihw aXBlKSwgdmFsKTsKK30KKwogc3RhdGljIHZvaWQgaHN3X2NvbG9yX2NvbW1pdChjb25zdCBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKQEAgLTU4NSw4ICs2 MTEsNyBAQCB2b2lkIGludGVsX2NvbG9yX2NvbW1pdChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGNydGNfc3RhdGUtPmJhc2UuY3J0Yy0+ZGV2KTsKIAotCWlmIChkZXZfcHJpdi0+ ZGlzcGxheS5jb2xvcl9jb21taXQpCi0JCWRldl9wcml2LT5kaXNwbGF5LmNvbG9yX2NvbW1pdChj cnRjX3N0YXRlKTsKKwlkZXZfcHJpdi0+ZGlzcGxheS5jb2xvcl9jb21taXQoY3J0Y19zdGF0ZSk7 CiB9CiAKIGludCBpbnRlbF9jb2xvcl9jaGVjayhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSkKQEAgLTYzNCwyMCArNjU5LDI1IEBAIHZvaWQgaW50ZWxfY29sb3JfaW5pdChzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAogCWRybV9tb2RlX2NydGNfc2V0X2dhbW1hX3NpemUoJmNy dGMtPmJhc2UsIDI1Nik7CiAKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKLQkJZGV2 X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0gY2hlcnJ5dmlld19sb2FkX2x1dHM7Ci0JfSBlbHNl IGlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewotCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1 dHMgPSBpOXh4X2xvYWRfbHV0czsKLQkJZGV2X3ByaXYtPmRpc3BsYXkuY29sb3JfY29tbWl0ID0g aHN3X2NvbG9yX2NvbW1pdDsKLQl9IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikgfHwg SVNfR0VOOV9CQyhkZXZfcHJpdikgfHwKLQkJICAgSVNfQlJPWFRPTihkZXZfcHJpdikpIHsKLQkJ ZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0gYnJvYWR3ZWxsX2xvYWRfbHV0czsKLQkJZGV2 X3ByaXYtPmRpc3BsYXkuY29sb3JfY29tbWl0ID0gaHN3X2NvbG9yX2NvbW1pdDsKLQl9IGVsc2Ug aWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpIHx8IElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKSB7 Ci0JCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGdsa19sb2FkX2x1dHM7Ci0JCWRldl9w cml2LT5kaXNwbGF5LmNvbG9yX2NvbW1pdCA9IGhzd19jb2xvcl9jb21taXQ7CisJaWYgKEhBU19H TUNIX0RJU1BMQVkoZGV2X3ByaXYpKSB7CisJCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkK KwkJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGNoZXJyeXZpZXdfbG9hZF9sdXRzOwor CQllbHNlCisJCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMgPSBpOXh4X2xvYWRfbHV0czsK KworCQlkZXZfcHJpdi0+ZGlzcGxheS5jb2xvcl9jb21taXQgPSBpOXh4X2NvbG9yX2NvbW1pdDsK IAl9IGVsc2UgewotCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMgPSBpOXh4X2xvYWRfbHV0 czsKKwkJaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpIHx8IElTX0dFTUlOSUxBS0UoZGV2X3By aXYpKQorCQkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0gZ2xrX2xvYWRfbHV0czsKKwkJ ZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5IHx8IElTX0JST0FEV0VMTChkZXZfcHJp dikpCisJCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMgPSBicm9hZHdlbGxfbG9hZF9sdXRz OworCQllbHNlCisJCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMgPSBpOXh4X2xvYWRfbHV0 czsKKworCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4IHx8IElTX0hBU1dFTEwoZGV2X3By aXYpKQorCQkJZGV2X3ByaXYtPmRpc3BsYXkuY29sb3JfY29tbWl0ID0gaHN3X2NvbG9yX2NvbW1p dDsKKwkJZWxzZQorCQkJZGV2X3ByaXYtPmRpc3BsYXkuY29sb3JfY29tbWl0ID0gaWxrX2NvbG9y X2NvbW1pdDsKIAl9CiAKIAkvKiBFbmFibGUgY29sb3IgbWFuYWdlbWVudCBzdXBwb3J0IHdoZW4g d2UgaGF2ZSBkZWdhbW1hICYgZ2FtbWEgTFVUcy4gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwppbmRleCAxY2FlZTQxMjg5NzQuLjkwYWZjYWU5MWIzMCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzQxNSw3ICszNDE1LDcgQEAgc3RhdGljIHZvaWQgaTl4 eF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJICoKIAkgKiBPbiBw cmUtZzR4IHRoZXJlIGlzIG5vIHdheSB0byBnYW1tYSBjb3JyZWN0IHRoZQogCSAqIHBpcGUgYm90 dG9tIGNvbG9yIGJ1dCB3ZSdsbCBrZWVwIG9uIGRvaW5nIHRoaXMKLQkgKiBhbnl3YXkuCisJICog YW55d2F5IHNvIHRoYXQgdGhlIGNydGMgc3RhdGUgcmVhZG91dCB3b3JrcyBjb3JyZWN0bHkuCiAJ ICovCiAJZHNwY250ciA9IGk5eHhfcGxhbmVfY3RsX2NydGMoY3J0Y19zdGF0ZSk7CiAKQEAgLTc2 MjcsNiArNzYyNyw4IEBAIHN0YXRpYyB2b2lkIGk5eHhfc2V0X3BpcGVjb25mKGNvbnN0IHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCSAgICAgY3J0Y19zdGF0ZS0+bGltaXRl ZF9jb2xvcl9yYW5nZSkKIAkJcGlwZWNvbmYgfD0gUElQRUNPTkZfQ09MT1JfUkFOR0VfU0VMRUNU OwogCisJcGlwZWNvbmYgfD0gUElQRUNPTkZfR0FNTUFfTU9ERShjcnRjX3N0YXRlLT5nYW1tYV9t b2RlKTsKKwogCUk5MTVfV1JJVEUoUElQRUNPTkYoY3J0Yy0+cGlwZSksIHBpcGVjb25mKTsKIAlQ T1NUSU5HX1JFQUQoUElQRUNPTkYoY3J0Yy0+cGlwZSkpOwogfQpAQCAtODA3Nyw2ICs4MDc5LDkg QEAgc3RhdGljIGJvb2wgaTl4eF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNy dGMsCiAJICAgICh0bXAgJiBQSVBFQ09ORl9DT0xPUl9SQU5HRV9TRUxFQ1QpKQogCQlwaXBlX2Nv bmZpZy0+bGltaXRlZF9jb2xvcl9yYW5nZSA9IHRydWU7CiAKKwlwaXBlX2NvbmZpZy0+Z2FtbWFf bW9kZSA9ICh0bXAgJiBQSVBFQ09ORl9HQU1NQV9NT0RFX01BU0tfSTlYWCkgPj4KKwkJUElQRUNP TkZfR0FNTUFfTU9ERV9TSElGVDsKKwogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNCkKIAkJ cGlwZV9jb25maWctPmRvdWJsZV93aWRlID0gdG1wICYgUElQRUNPTkZfRE9VQkxFX1dJREU7CiAK QEAgLTg2MTYsNiArODYyMSw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3NldF9waXBlY29uZihj b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlpZiAoY3J0Y19zdGF0 ZS0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJdmFsIHw9IFBJUEVDT05GX0NPTE9SX1JBTkdFX1NF TEVDVDsKIAorCXZhbCB8PSBQSVBFQ09ORl9HQU1NQV9NT0RFKGNydGNfc3RhdGUtPmdhbW1hX21v ZGUpOworCiAJSTkxNV9XUklURShQSVBFQ09ORihwaXBlKSwgdmFsKTsKIAlQT1NUSU5HX1JFQUQo UElQRUNPTkYocGlwZSkpOwogfQpAQCAtOTE0Nyw2ICs5MTU0LDkgQEAgc3RhdGljIGJvb2wgaXJv bmxha2VfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWlmICh0bXAg JiBQSVBFQ09ORl9DT0xPUl9SQU5HRV9TRUxFQ1QpCiAJCXBpcGVfY29uZmlnLT5saW1pdGVkX2Nv bG9yX3JhbmdlID0gdHJ1ZTsKIAorCXBpcGVfY29uZmlnLT5nYW1tYV9tb2RlID0gKHRtcCAmIFBJ UEVDT05GX0dBTU1BX01PREVfTUFTS19JTEspID4+CisJCVBJUEVDT05GX0dBTU1BX01PREVfU0hJ RlQ7CisKIAlpZiAoSTkxNV9SRUFEKFBDSF9UUkFOU0NPTkYoY3J0Yy0+cGlwZSkpICYgVFJBTlNf RU5BQkxFKSB7CiAJCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqcGxsOwogCQllbnVtIGludGVs X2RwbGxfaWQgcGxsX2lkOwpAQCAtMTE5NzcsNiArMTE5ODcsOCBAQCBpbnRlbF9waXBlX2NvbmZp Z19jb21wYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCVBJUEVfQ09O Rl9DSEVDS19CT09MKGRvdWJsZV93aWRlKTsKIAorCVBJUEVfQ09ORl9DSEVDS19YKGdhbW1hX21v ZGUpOworCiAJUElQRV9DT05GX0NIRUNLX1Aoc2hhcmVkX2RwbGwpOwogCVBJUEVfQ09ORl9DSEVD S19YKGRwbGxfaHdfc3RhdGUuZHBsbCk7CiAJUElQRV9DT05GX0NIRUNLX1goZHBsbF9od19zdGF0 ZS5kcGxsX21kKTsKLS0gCjIuMTkuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==