From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH v3 3/7] drm/i915: Track pipe csc enable in crtc state Date: Thu, 7 Feb 2019 22:21:42 +0200 Message-ID: <20190207202146.26423-4-ville.syrjala@linux.intel.com> References: <20190207202146.26423-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 mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F9A06ECE3 for ; Thu, 7 Feb 2019 20:21:59 +0000 (UTC) In-Reply-To: <20190207202146.26423-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkp1 c3QgbGlrZSB3ZSBkaWQgZm9yIHBpcGUgZ2FtbWEsIGxldCdzIGFsc28gdHJhY2sgdGhlIHBpcGUg Y3NjCnN0YXRlLiBUaGUgaGFyZHdhcmUgb25seSBleGlzdHMgb24gSUxLKywgYW5kIGN1cnJlbnRs eSB3ZSBhbHdheXMKZW5hYmxlIGl0IG9uIGhzdysgYW5kIG5ldmVyIG9uIGFueSBvdGhlciBwbGF0 Zm9ybXMuIEp1c3QgbGlrZQp3aXRoIHBpcGUgZ2FtbWEsIHRoZSBwcmltYXJ5IHBsYW5lIGNvbnRy b2wgcmVnaXN0ZXIgaXMgdXNlZApmb3IgdGhlIHJlYWRvdXQgb24gcHJlLVNLTCwgYW5kIHRoZSBw aXBlIGJvdHRvbSBjb2xvciByZWdpc3RlcgpvbiBTS0wrLgoKdjI6IFJlYmFzZQp2MzogQWxsb3cg ZmFzdGJvb3Qgd2l0aCBjc2NfZW5hYmxlIGNoYW5nZXMgKE1hYXJ0ZW4pCiAgICBEZWFsIHdpdGgg SEFTX0dNQ0gKClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJA aW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVW1hIFNoYW5rYXIgPHVtYS5zaGFua2FyQGludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgfCAgNCArKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jICAgfCAgNyArKysrKystCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxOCArKysrKysrKysrKysrKy0tLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAzICsrKwogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgIDYgKysrKy0tCiA1IGZpbGVzIGNoYW5nZWQsIDI5 IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5k ZXggYzNiYzk5ZDlhOTA0Li4xMWJmNjBkNWU3NDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApA QCAtNjEzMCw3ICs2MTMwLDcgQEAgZW51bSB7CiAjZGVmaW5lICAgTUNVUlNPUl9QSVBFX1NFTEVD VF9TSElGVAkyOAogI2RlZmluZSAgIE1DVVJTT1JfUElQRV9TRUxFQ1QocGlwZSkJKChwaXBlKSA8 PCAyOCkKICNkZWZpbmUgICBNQ1VSU09SX0dBTU1BX0VOQUJMRSAgKDEgPDwgMjYpCi0jZGVmaW5l ICAgTUNVUlNPUl9QSVBFX0NTQ19FTkFCTEUgKDEgPDwgMjQpCisjZGVmaW5lICAgTUNVUlNPUl9Q SVBFX0NTQ19FTkFCTEUgKDEgPDwgMjQpIC8qIGlsaysgKi8KICNkZWZpbmUgICBNQ1VSU09SX1JP VEFURV8xODAJKDEgPDwgMTUpCiAjZGVmaW5lICAgTUNVUlNPUl9UUklDS0xFX0ZFRURfRElTQUJM RQkoMSA8PCAxNCkKICNkZWZpbmUgX0NVUkFCQVNFCQkweDcwMDg0CkBAIC02MTg1LDcgKzYxODUs NyBAQCBlbnVtIHsKICNkZWZpbmUgICBESVNQUExBTkVfUkdCQTg4OAkJCSgweGYgPDwgMjYpCiAj ZGVmaW5lICAgRElTUFBMQU5FX1NURVJFT19FTkFCTEUJCSgxIDw8IDI1KQogI2RlZmluZSAgIERJ U1BQTEFORV9TVEVSRU9fRElTQUJMRQkJMAotI2RlZmluZSAgIERJU1BQTEFORV9QSVBFX0NTQ19F TkFCTEUJCSgxIDw8IDI0KQorI2RlZmluZSAgIERJU1BQTEFORV9QSVBFX0NTQ19FTkFCTEUJCSgx IDw8IDI0KSAvKiBpbGsrICovCiAjZGVmaW5lICAgRElTUFBMQU5FX1NFTF9QSVBFX1NISUZUCQky NAogI2RlZmluZSAgIERJU1BQTEFORV9TRUxfUElQRV9NQVNLCQkoMyA8PCBESVNQUExBTkVfU0VM X1BJUEVfU0hJRlQpCiAjZGVmaW5lICAgRElTUFBMQU5FX1NFTF9QSVBFKHBpcGUpCQkoKHBpcGUp IDw8IERJU1BQTEFORV9TRUxfUElQRV9TSElGVCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NvbG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5j CmluZGV4IDc0NjEzOGQ3YmNiYy4uZTNiZjNiZDM1NWFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2NvbG9yLmMKQEAgLTQwMSw3ICs0MDEsOCBAQCBzdGF0aWMgdm9pZCBza2xfY29sb3JfY29tbWl0 KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCSAqLwogCWlmIChj cnRjX3N0YXRlLT5nYW1tYV9lbmFibGUpCiAJCXZhbCB8PSBTS0xfQk9UVE9NX0NPTE9SX0dBTU1B X0VOQUJMRTsKLQl2YWwgfD0gU0tMX0JPVFRPTV9DT0xPUl9DU0NfRU5BQkxFOworCWlmIChjcnRj X3N0YXRlLT5jc2NfZW5hYmxlKQorCQl2YWwgfD0gU0tMX0JPVFRPTV9DT0xPUl9DU0NfRU5BQkxF OwogCUk5MTVfV1JJVEUoU0tMX0JPVFRPTV9DT0xPUihwaXBlKSwgdmFsKTsKIAogCUk5MTVfV1JJ VEUoR0FNTUFfTU9ERShjcnRjLT5waXBlKSwgY3J0Y19zdGF0ZS0+Z2FtbWFfbW9kZSk7CkBAIC02 NjgsNiArNjY5LDEwIEBAIGludCBpbnRlbF9jb2xvcl9jaGVjayhzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAogCWNydGNfc3RhdGUtPmdhbW1hX2VuYWJsZSA9IHRydWU7CiAK KwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5IHx8CisJICAgIElTX0JST0FEV0VMTChkZXZf cHJpdikgfHwgSVNfSEFTV0VMTChkZXZfcHJpdikpCisJCWNydGNfc3RhdGUtPmNzY19lbmFibGUg PSB0cnVlOworCiAJLyogQWx3YXlzIGFsbG93IGxlZ2FjeSBnYW1tYSBMVVQgd2l0aCBubyBmdXJ0 aGVyIGNoZWNraW5nLiAqLwogCWlmIChjcnRjX3N0YXRlX2lzX2xlZ2FjeV9nYW1tYShjcnRjX3N0 YXRlKSkgewogCQljcnRjX3N0YXRlLT5nYW1tYV9tb2RlID0gR0FNTUFfTU9ERV9NT0RFXzhCSVQ7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMjk0NzljZjc5ZDhlLi41NzE2 ZWI5OWI3OTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTMyMjQsNyAr MzIyNCw3IEBAIHN0YXRpYyB1MzIgaTl4eF9wbGFuZV9jdGxfY3J0Yyhjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfZW5hYmxl KQogCQlkc3BjbnRyIHw9IERJU1BQTEFORV9HQU1NQV9FTkFCTEU7CiAKLQlpZiAoSVNfSEFTV0VM TChkZXZfcHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKKwlpZiAoY3J0Y19zdGF0ZS0+ Y3NjX2VuYWJsZSkKIAkJZHNwY250ciB8PSBESVNQUExBTkVfUElQRV9DU0NfRU5BQkxFOwogCiAJ aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA1KQpAQCAtMzcwNSw3ICszNzA1LDggQEAgdTMyIHNr bF9wbGFuZV9jdGxfY3J0Yyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSkKIAlpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfZW5hYmxlKQogCQlwbGFuZV9jdGwgfD0gUExBTkVf Q1RMX1BJUEVfR0FNTUFfRU5BQkxFOwogCi0JcGxhbmVfY3RsIHw9IFBMQU5FX0NUTF9QSVBFX0NT Q19FTkFCTEU7CisJaWYgKGNydGNfc3RhdGUtPmNzY19lbmFibGUpCisJCXBsYW5lX2N0bCB8PSBQ TEFORV9DVExfUElQRV9DU0NfRU5BQkxFOwogCiAJcmV0dXJuIHBsYW5lX2N0bDsKIH0KQEAgLTM3 NjAsNyArMzc2MSw4IEBAIHUzMiBnbGtfcGxhbmVfY29sb3JfY3RsX2NydGMoY29uc3Qgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJaWYgKGNydGNfc3RhdGUtPmdhbW1hX2Vu YWJsZSkKIAkJcGxhbmVfY29sb3JfY3RsIHw9IFBMQU5FX0NPTE9SX1BJUEVfR0FNTUFfRU5BQkxF OwogCi0JcGxhbmVfY29sb3JfY3RsIHw9IFBMQU5FX0NPTE9SX1BJUEVfQ1NDX0VOQUJMRTsKKwlp ZiAoY3J0Y19zdGF0ZS0+Y3NjX2VuYWJsZSkKKwkJcGxhbmVfY29sb3JfY3RsIHw9IFBMQU5FX0NP TE9SX1BJUEVfQ1NDX0VOQUJMRTsKIAogCXJldHVybiBwbGFuZV9jb2xvcl9jdGw7CiB9CkBAIC04 MTE4LDYgKzgxMjAsMTAgQEAgc3RhdGljIHZvaWQgaTl4eF9nZXRfcGlwZV9jb2xvcl9jb25maWco c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAKIAlpZiAodG1wICYgRElTUFBM QU5FX0dBTU1BX0VOQUJMRSkKIAkJY3J0Y19zdGF0ZS0+Z2FtbWFfZW5hYmxlID0gdHJ1ZTsKKwor CWlmICghSEFTX0dNQ0goZGV2X3ByaXYpICYmCisJICAgIHRtcCAmIERJU1BQTEFORV9QSVBFX0NT Q19FTkFCTEUpCisJCWNydGNfc3RhdGUtPmNzY19lbmFibGUgPSB0cnVlOwogfQogCiBzdGF0aWMg Ym9vbCBpOXh4X2dldF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKQEAgLTk4 ODksNiArOTg5NSw5IEBAIHN0YXRpYyBib29sIGhhc3dlbGxfZ2V0X3BpcGVfY29uZmlnKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLAogCiAJCWlmICh0bXAgJiBTS0xfQk9UVE9NX0NPTE9SX0dBTU1B X0VOQUJMRSkKIAkJCXBpcGVfY29uZmlnLT5nYW1tYV9lbmFibGUgPSB0cnVlOworCisJCWlmICh0 bXAgJiBTS0xfQk9UVE9NX0NPTE9SX0NTQ19FTkFCTEUpCisJCQlwaXBlX2NvbmZpZy0+Y3NjX2Vu YWJsZSA9IHRydWU7CiAJfSBlbHNlIHsKIAkJaTl4eF9nZXRfcGlwZV9jb2xvcl9jb25maWcocGlw ZV9jb25maWcpOwogCX0KQEAgLTEwMjI1LDcgKzEwMjM0LDcgQEAgc3RhdGljIHUzMiBpOXh4X2N1 cnNvcl9jdGxfY3J0Yyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkK IAlpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfZW5hYmxlKQogCQljbnRsID0gTUNVUlNPUl9HQU1NQV9F TkFCTEU7CiAKLQlpZiAoSEFTX0RESShkZXZfcHJpdikpCisJaWYgKGNydGNfc3RhdGUtPmNzY19l bmFibGUpCiAJCWNudGwgfD0gTUNVUlNPUl9QSVBFX0NTQ19FTkFCTEU7CiAKIAlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA8IDUgJiYgIUlTX0c0WChkZXZfcHJpdikpCkBAIC0xMjEyNSw2ICsxMjEz NCw3IEBAIGludGVsX3BpcGVfY29uZmlnX2NvbXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCiAJCVBJUEVfQ09ORl9DSEVDS19YKGdhbW1hX21vZGUpOwogCQlQSVBFX0NP TkZfQ0hFQ0tfQk9PTChnYW1tYV9lbmFibGUpOworCQlQSVBFX0NPTkZfQ0hFQ0tfQk9PTChjc2Nf ZW5hYmxlKTsKIAl9CiAKIAlQSVBFX0NPTkZfQ0hFQ0tfQk9PTChkb3VibGVfd2lkZSk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGVkNTMxMzAyNWE5ZS4uY2E5NGJkNzlkNmM2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtOTY0LDYgKzk2NCw5IEBAIHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlIHsKIAkvKiBlbmFibGUgcGlwZSBnYW1tYT8gKi8KIAlib29sIGdhbW1hX2VuYWJs ZTsKIAorCS8qIGVuYWJsZSBwaXBlIGNzYz8gKi8KKwlib29sIGNzY19lbmFibGU7CisKIAkvKiBE aXNwbGF5IFN0cmVhbSBjb21wcmVzc2lvbiBzdGF0ZSAqLwogCXN0cnVjdCB7CiAJCWJvb2wgY29t cHJlc3Npb25fZW5hYmxlOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf c3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBkYjM3 M2UzYWM2MDEuLjYxMDM5ODYwN2U4ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMK QEAgLTkyMSwxMyArOTIxLDEyIEBAIHZsdl9wbGFuZV9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVs X3BsYW5lICpwbGFuZSwKIAogc3RhdGljIHUzMiBpdmJfc3ByaXRlX2N0bF9jcnRjKGNvbnN0IHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjLT5kZXYpOwog CXUzMiBzcHJjdGwgPSAwOwogCiAJaWYgKGNydGNfc3RhdGUtPmdhbW1hX2VuYWJsZSkKIAkJc3By Y3RsIHw9IFNQUklURV9HQU1NQV9FTkFCTEU7CiAKLQlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikg fHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKKwlpZiAoY3J0Y19zdGF0ZS0+Y3NjX2VuYWJsZSkK IAkJc3ByY3RsIHw9IFNQUklURV9QSVBFX0NTQ19FTkFCTEU7CiAKIAlyZXR1cm4gc3ByY3RsOwpA QCAtMTExOCw2ICsxMTE3LDkgQEAgc3RhdGljIHUzMiBnNHhfc3ByaXRlX2N0bF9jcnRjKGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCWlmIChjcnRjX3N0YXRlLT5n YW1tYV9lbmFibGUpCiAJCWR2c2NudHIgfD0gRFZTX0dBTU1BX0VOQUJMRTsKIAorCWlmIChjcnRj X3N0YXRlLT5jc2NfZW5hYmxlKQorCQlkdnNjbnRyIHw9IERWU19QSVBFX0NTQ19FTkFCTEU7CisK IAlyZXR1cm4gZHZzY250cjsKIH0KIAotLSAKMi4xOS4yCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK