From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH v2 07/13] drm/i915: Populate gamma_mode for all platforms Date: Tue, 5 Feb 2019 18:08:42 +0200 Message-ID: <20190205160848.24662-8-ville.syrjala@linux.intel.com> References: <20190205160848.24662-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 711E16E728 for ; Tue, 5 Feb 2019 16:09:16 +0000 (UTC) In-Reply-To: <20190205160848.24662-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 Zy5oCmluZGV4IGVkZTU0ZmRjMTY3Ni4uNDExMTFhMTdlNTE5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmgKQEAgLTU1OTAsOSArNTU5MCwxNSBAQCBlbnVtIHsKICNkZWZpbmUgICBQSVBFQ09ORl9T SU5HTEVfV0lERQkwCiAjZGVmaW5lICAgUElQRUNPTkZfUElQRV9VTkxPQ0tFRCAwCiAjZGVmaW5l ICAgUElQRUNPTkZfUElQRV9MT0NLRUQJKDEgPDwgMjUpCi0jZGVmaW5lICAgUElQRUNPTkZfUEFM RVRURQkwCi0jZGVmaW5lICAgUElQRUNPTkZfR0FNTUEJCSgxIDw8IDI0KQogI2RlZmluZSAgIFBJ UEVDT05GX0ZPUkNFX0JPUkRFUgkoMSA8PCAyNSkKKyNkZWZpbmUgICBQSVBFQ09ORl9HQU1NQV9N T0RFX01BU0tfSTlYWAkoMSA8PCAyNCkgLyogZ21jaCAqLworI2RlZmluZSAgIFBJUEVDT05GX0dB TU1BX01PREVfTUFTS19JTEsJKDMgPDwgMjQpIC8qIGlsay1pdmIgKi8KKyNkZWZpbmUgICBQSVBF Q09ORl9HQU1NQV9NT0RFXzhCSVQJKDAgPDwgMjQpIC8qIGdtY2gsaWxrLWl2YiAqLworI2RlZmlu ZSAgIFBJUEVDT05GX0dBTU1BX01PREVfMTBCSVQJKDEgPDwgMjQpIC8qIGdtY2gsaWxrLWl2YiAq LworI2RlZmluZSAgIFBJUEVDT05GX0dBTU1BX01PREVfMTJCSVQJKDIgPDwgMjQpIC8qIGlsay1p dmIgKi8KKyNkZWZpbmUgICBQSVBFQ09ORl9HQU1NQV9NT0RFX1NQTElUCSgzIDw8IDI0KSAvKiBp dmIgKi8KKyNkZWZpbmUgICBQSVBFQ09ORl9HQU1NQV9NT0RFKHgpCSgoeCk8PDI0KSAvKiBwYXNz IGluIEdBTU1BX01PREVfTU9ERV8qICovCisjZGVmaW5lICAgUElQRUNPTkZfR0FNTUFfTU9ERV9T SElGVAkyNAogI2RlZmluZSAgIFBJUEVDT05GX0lOVEVSTEFDRV9NQVNLCSg3IDw8IDIxKQogI2Rl ZmluZSAgIFBJUEVDT05GX0lOVEVSTEFDRV9NQVNLX0hTVwkoMyA8PCAyMSkKIC8qIE5vdGUgdGhh dCBwcmUtZ2VuMyBkb2VzIG5vdCBzdXBwb3J0IGludGVybGFjZWQgZGlzcGxheSBkaXJlY3RseS4g UGFuZWwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCmluZGV4IDJhMzcxZWVkODA2MS4uZTdk ZDA3NDkwYzY4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5j 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 CiB9CiAKIHN0YXRpYyBpbnQgY2hlY2tfbHV0X3NpemUoY29uc3Qgc3RydWN0IGRybV9wcm9wZXJ0 eV9ibG9iICpsdXQsIGludCBleHBlY3RlZCkKQEAgLTY0OSwyMCArNjc0LDI1IEBAIHZvaWQgaW50 ZWxfY29sb3JfaW5pdChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAogCWRybV9tb2RlX2NydGNf c2V0X2dhbW1hX3NpemUoJmNydGMtPmJhc2UsIDI1Nik7CiAKLQlpZiAoSVNfQ0hFUlJZVklFVyhk ZXZfcHJpdikpIHsKLQkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0gY2hlcnJ5dmlld19s b2FkX2x1dHM7Ci0JfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewotCQlkZXZfcHJp di0+ZGlzcGxheS5sb2FkX2x1dHMgPSBpOXh4X2xvYWRfbHV0czsKLQkJZGV2X3ByaXYtPmRpc3Bs YXkuY29sb3JfY29tbWl0ID0gaHN3X2NvbG9yX2NvbW1pdDsKLQl9IGVsc2UgaWYgKElTX0JST0FE V0VMTChkZXZfcHJpdikgfHwgSVNfR0VOOV9CQyhkZXZfcHJpdikgfHwKLQkJICAgSVNfQlJPWFRP TihkZXZfcHJpdikpIHsKLQkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0gYnJvYWR3ZWxs X2xvYWRfbHV0czsKLQkJZGV2X3ByaXYtPmRpc3BsYXkuY29sb3JfY29tbWl0ID0gaHN3X2NvbG9y X2NvbW1pdDsKLQl9IGVsc2UgaWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpIHx8IElTX0NBTk5P TkxBS0UoZGV2X3ByaXYpKSB7Ci0JCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGdsa19s b2FkX2x1dHM7Ci0JCWRldl9wcml2LT5kaXNwbGF5LmNvbG9yX2NvbW1pdCA9IGhzd19jb2xvcl9j b21taXQ7CisJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKSB7CisJCWlmIChJU19DSEVS UllWSUVXKGRldl9wcml2KSkKKwkJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGNoZXJy eXZpZXdfbG9hZF9sdXRzOworCQllbHNlCisJCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMg PSBpOXh4X2xvYWRfbHV0czsKKworCQlkZXZfcHJpdi0+ZGlzcGxheS5jb2xvcl9jb21taXQgPSBp OXh4X2NvbG9yX2NvbW1pdDsKIAl9IGVsc2UgewotCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1 dHMgPSBpOXh4X2xvYWRfbHV0czsKKwkJaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpIHx8IElT X0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0g Z2xrX2xvYWRfbHV0czsKKwkJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5IHx8IElT X0JST0FEV0VMTChkZXZfcHJpdikpCisJCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMgPSBi cm9hZHdlbGxfbG9hZF9sdXRzOworCQllbHNlCisJCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1 dHMgPSBpOXh4X2xvYWRfbHV0czsKKworCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4IHx8 IElTX0hBU1dFTEwoZGV2X3ByaXYpKQorCQkJZGV2X3ByaXYtPmRpc3BsYXkuY29sb3JfY29tbWl0 ID0gaHN3X2NvbG9yX2NvbW1pdDsKKwkJZWxzZQorCQkJZGV2X3ByaXYtPmRpc3BsYXkuY29sb3Jf Y29tbWl0ID0gaWxrX2NvbG9yX2NvbW1pdDsKIAl9CiAKIAkvKiBFbmFibGUgY29sb3IgbWFuYWdl bWVudCBzdXBwb3J0IHdoZW4gd2UgaGF2ZSBkZWdhbW1hICYgZ2FtbWEgTFVUcy4gKi8KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBhZDVkMzlkODFkNmUuLjhlOTM0NTlmMzEy ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzQ1MCw3ICszNDUwLDcg QEAgc3RhdGljIHZvaWQgaTl4eF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxh bmUsCiAJICoKIAkgKiBPbiBwcmUtZzR4IHRoZXJlIGlzIG5vIHdheSB0byBnYW1tYSBjb3JyZWN0 IHRoZQogCSAqIHBpcGUgYm90dG9tIGNvbG9yIGJ1dCB3ZSdsbCBrZWVwIG9uIGRvaW5nIHRoaXMK LQkgKiBhbnl3YXkuCisJICogYW55d2F5IHNvIHRoYXQgdGhlIGNydGMgc3RhdGUgcmVhZG91dCB3 b3JrcyBjb3JyZWN0bHkuCiAJICovCiAJZHNwY250ciA9IGk5eHhfcGxhbmVfY3RsX2NydGMoY3J0 Y19zdGF0ZSk7CiAKQEAgLTc2NzQsNiArNzY3NCw4IEBAIHN0YXRpYyB2b2lkIGk5eHhfc2V0X3Bp cGVjb25mKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCSAgICAg Y3J0Y19zdGF0ZS0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJcGlwZWNvbmYgfD0gUElQRUNPTkZf Q09MT1JfUkFOR0VfU0VMRUNUOwogCisJcGlwZWNvbmYgfD0gUElQRUNPTkZfR0FNTUFfTU9ERShj cnRjX3N0YXRlLT5nYW1tYV9tb2RlKTsKKwogCUk5MTVfV1JJVEUoUElQRUNPTkYoY3J0Yy0+cGlw ZSksIHBpcGVjb25mKTsKIAlQT1NUSU5HX1JFQUQoUElQRUNPTkYoY3J0Yy0+cGlwZSkpOwogfQpA QCAtODEyNiw2ICs4MTI4LDkgQEAgc3RhdGljIGJvb2wgaTl4eF9nZXRfcGlwZV9jb25maWcoc3Ry dWN0IGludGVsX2NydGMgKmNydGMsCiAJICAgICh0bXAgJiBQSVBFQ09ORl9DT0xPUl9SQU5HRV9T RUxFQ1QpKQogCQlwaXBlX2NvbmZpZy0+bGltaXRlZF9jb2xvcl9yYW5nZSA9IHRydWU7CiAKKwlw aXBlX2NvbmZpZy0+Z2FtbWFfbW9kZSA9ICh0bXAgJiBQSVBFQ09ORl9HQU1NQV9NT0RFX01BU0tf STlYWCkgPj4KKwkJUElQRUNPTkZfR0FNTUFfTU9ERV9TSElGVDsKKwogCWlmIChJTlRFTF9HRU4o ZGV2X3ByaXYpIDwgNCkKIAkJcGlwZV9jb25maWctPmRvdWJsZV93aWRlID0gdG1wICYgUElQRUNP TkZfRE9VQkxFX1dJREU7CiAKQEAgLTg2NjUsNiArODY3MCw4IEBAIHN0YXRpYyB2b2lkIGlyb25s YWtlX3NldF9waXBlY29uZihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSkKIAlpZiAoY3J0Y19zdGF0ZS0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJdmFsIHw9IFBJUEVD T05GX0NPTE9SX1JBTkdFX1NFTEVDVDsKIAorCXZhbCB8PSBQSVBFQ09ORl9HQU1NQV9NT0RFKGNy dGNfc3RhdGUtPmdhbW1hX21vZGUpOworCiAJSTkxNV9XUklURShQSVBFQ09ORihwaXBlKSwgdmFs KTsKIAlQT1NUSU5HX1JFQUQoUElQRUNPTkYocGlwZSkpOwogfQpAQCAtOTE5OSw2ICs5MjA2LDkg QEAgc3RhdGljIGJvb2wgaXJvbmxha2VfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjLAogCWlmICh0bXAgJiBQSVBFQ09ORl9DT0xPUl9SQU5HRV9TRUxFQ1QpCiAJCXBpcGVf Y29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlID0gdHJ1ZTsKIAorCXBpcGVfY29uZmlnLT5nYW1t YV9tb2RlID0gKHRtcCAmIFBJUEVDT05GX0dBTU1BX01PREVfTUFTS19JTEspID4+CisJCVBJUEVD T05GX0dBTU1BX01PREVfU0hJRlQ7CisKIAlpZiAoSTkxNV9SRUFEKFBDSF9UUkFOU0NPTkYoY3J0 Yy0+cGlwZSkpICYgVFJBTlNfRU5BQkxFKSB7CiAJCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAq cGxsOwogCQllbnVtIGludGVsX2RwbGxfaWQgcGxsX2lkOwpAQCAtMTIwNjksNiArMTIwNzksOCBA QCBpbnRlbF9waXBlX2NvbmZpZ19jb21wYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAogCVBJUEVfQ09ORl9DSEVDS19CT09MKGRvdWJsZV93aWRlKTsKIAorCVBJUEVfQ09O Rl9DSEVDS19YKGdhbW1hX21vZGUpOworCiAJUElQRV9DT05GX0NIRUNLX1Aoc2hhcmVkX2RwbGwp OwogCVBJUEVfQ09ORl9DSEVDS19YKGRwbGxfaHdfc3RhdGUuZHBsbCk7CiAJUElQRV9DT05GX0NI RUNLX1goZHBsbF9od19zdGF0ZS5kcGxsX21kKTsKLS0gCjIuMTkuMgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==