From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v3 4/6] drm/i915/crc: Make IPS workaround generic Date: Wed, 27 Feb 2019 17:32:57 -0800 Message-ID: <20190228013259.30026-4-jose.souza@intel.com> References: <20190228013259.30026-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B2576E0EC for ; Thu, 28 Feb 2019 01:33:24 +0000 (UTC) In-Reply-To: <20190228013259.30026-1-jose.souza@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 Cc: Dhinakaran Pandiyan List-Id: intel-gfx@lists.freedesktop.org T3RoZXIgZmVhdHVyZXMgbGlrZSBQU1IyIGFsc28gbmVlZHMgdG8gYmUgZGlzYWJsZWQgd2hpbGUg Z2V0dGluZyBDUkMKc28gbGV0cyByZW5hbWUgaXBzX2ZvcmNlX2Rpc2FibGUgdG8gY3JjX2VuYWJs ZWQsIGRyb3AgYWxsIHRoaXMgY2hlY2tzCmZvciBwaXBlIEEgYW5kIEhTVyBhbmQgQkRXIGFuZCBt YWtlIGl0IGdlbmVyaWMgYW5kCmhzd19jb21wdXRlX2lwc19jb25maWcoKSB3aWxsIHRha2UgY2Fy ZSBvZiBhbGwgdGhlIGNoZWNrcyByZW1vdmVkCmZyb20gaGVyZS4KCkNjOiBEaGluYWthcmFuIFBh bmRpeWFuIDxkaGluYWthcmFuLnBhbmRpeWFuQGludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzD pCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEpvc8OpIFJv YmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgfCAxMCArKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCAgICAgIHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bp cGVfY3JjLmMgfCA0MiArKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMjQgaW5zZXJ0aW9ucygrKSwgMzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCmluZGV4IDgxNmU4ZjEyNGIzYi4uMzI4OTY3YzY0MmIzIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC02NzUxLDcgKzY3NTEsMTMgQEAgc3RhdGljIGJv b2wgaHN3X2NvbXB1dGVfaXBzX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSkKIAlpZiAoIWhzd19jcnRjX3N0YXRlX2lwc19jYXBhYmxlKGNydGNfc3RhdGUpKQogCQly ZXR1cm4gZmFsc2U7CiAKLQlpZiAoY3J0Y19zdGF0ZS0+aXBzX2ZvcmNlX2Rpc2FibGUpCisJLyoK KwkgKiBXaGVuIElQUyBnZXRzIGVuYWJsZWQsIHRoZSBwaXBlIENSQyBjaGFuZ2VzLiBTaW5jZSBJ UFMgZ2V0cworCSAqIGVuYWJsZWQgYW5kIGRpc2FibGVkIGR5bmFtaWNhbGx5IGJhc2VkIG9uIHBh Y2thZ2UgQyBzdGF0ZXMsCisJICogdXNlciBzcGFjZSBjYW4ndCBtYWtlIHJlbGlhYmxlIHVzZSBv ZiB0aGUgQ1JDcywgc28gbGV0J3MganVzdAorCSAqIGNvbXBsZXRlbHkgZGlzYWJsZSBpdC4KKwkg Ki8KKwlpZiAoY3J0Y19zdGF0ZS0+Y3JjX2VuYWJsZWQpCiAJCXJldHVybiBmYWxzZTsKIAogCS8q IElQUyBzaG91bGQgYmUgZmluZSBhcyBsb25nIGFzIGF0IGxlYXN0IG9uZSBwbGFuZSBpcyBlbmFi bGVkLiAqLwpAQCAtMTE2ODQsNyArMTE2OTAsNyBAQCBjbGVhcl9pbnRlbF9jcnRjX3N0YXRlKHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCXNhdmVkX3N0YXRlLT5zaGFyZWRf ZHBsbCA9IGNydGNfc3RhdGUtPnNoYXJlZF9kcGxsOwogCXNhdmVkX3N0YXRlLT5kcGxsX2h3X3N0 YXRlID0gY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZTsKIAlzYXZlZF9zdGF0ZS0+cGNoX3BmaXQu Zm9yY2VfdGhydSA9IGNydGNfc3RhdGUtPnBjaF9wZml0LmZvcmNlX3RocnU7Ci0Jc2F2ZWRfc3Rh dGUtPmlwc19mb3JjZV9kaXNhYmxlID0gY3J0Y19zdGF0ZS0+aXBzX2ZvcmNlX2Rpc2FibGU7CisJ c2F2ZWRfc3RhdGUtPmNyY19lbmFibGVkID0gY3J0Y19zdGF0ZS0+Y3JjX2VuYWJsZWQ7CiAJaWYg KElTX0c0WChkZXZfcHJpdikgfHwKIAkgICAgSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCXNhdmVkX3N0YXRlLT53bSA9IGNydGNfc3RhdGUtPndt OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA1NDEyMzczZTJmOTguLjJiZTY0NTI5ZTRh MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTk5OSw3ICs5OTksOCBAQCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSB7CiAJc3RydWN0IGludGVsX2xpbmtfbV9uIGZkaV9tX247CiAKIAli b29sIGlwc19lbmFibGVkOwotCWJvb2wgaXBzX2ZvcmNlX2Rpc2FibGU7CisKKwlib29sIGNyY19l bmFibGVkOwogCiAJYm9vbCBlbmFibGVfZmJjOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGlw ZV9jcmMuYwppbmRleCA1M2Q0ZWM2OGQzYzQuLmY2ZDBiMmFhZmZlMiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGlwZV9jcmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9waXBlX2NyYy5jCkBAIC0yODAsMTEgKzI4MCwxMiBAQCBzdGF0aWMgaW50IGls a19waXBlX2NyY19jdGxfcmVnKGVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNlICpzb3VyY2UsCiAJ cmV0dXJuIDA7CiB9CiAKLXN0YXRpYyB2b2lkIGhzd19waXBlX0FfY3JjX3dhKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKLQkJCSAgICAgIGJvb2wgZW5hYmxlKQorc3RhdGljIHZv aWQKK2ludGVsX2NydGNfY3JjX3ByZXBhcmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJCSAgICAgICBib29sIGVuYWJsZSkKIHsKIAlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07Ci0Jc3RydWN0IGludGVsX2Ny dGMgKmNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGlwZShkZXZfcHJpdiwgUElQRV9BKTsKKwlz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZTsKIAlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4OwpAQCAtMzAx LDIzICszMDIsMTUgQEAgc3RhdGljIHZvaWQgaHN3X3BpcGVfQV9jcmNfd2Eoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXN0YXRlLT5hY3F1aXJlX2N0eCA9ICZjdHg7CiAKIHJl dHJ5OgotCXBpcGVfY29uZmlnID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBj cnRjKTsKKwlwaXBlX2NvbmZpZyA9IGludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwg aW50ZWxfY3J0Yyk7CiAJaWYgKElTX0VSUihwaXBlX2NvbmZpZykpIHsKIAkJcmV0ID0gUFRSX0VS UihwaXBlX2NvbmZpZyk7CiAJCWdvdG8gcHV0X3N0YXRlOwogCX0KIAotCWlmIChIQVNfSVBTKGRl dl9wcml2KSkgewotCQkvKgotCQkgKiBXaGVuIElQUyBnZXRzIGVuYWJsZWQsIHRoZSBwaXBlIENS QyBjaGFuZ2VzLiBTaW5jZSBJUFMgZ2V0cwotCQkgKiBlbmFibGVkIGFuZCBkaXNhYmxlZCBkeW5h bWljYWxseSBiYXNlZCBvbiBwYWNrYWdlIEMgc3RhdGVzLAotCQkgKiB1c2VyIHNwYWNlIGNhbid0 IG1ha2UgcmVsaWFibGUgdXNlIG9mIHRoZSBDUkNzLCBzbyBsZXQncyBqdXN0Ci0JCSAqIGNvbXBs ZXRlbHkgZGlzYWJsZSBpdC4KLQkJICovCi0JCXBpcGVfY29uZmlnLT5pcHNfZm9yY2VfZGlzYWJs ZSA9IGVuYWJsZTsKLQl9CisJcGlwZV9jb25maWctPmNyY19lbmFibGVkID0gZW5hYmxlOwogCi0J aWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpICYm IGludGVsX2NydGMtPnBpcGUgPT0gUElQRV9BKSB7CiAJCXBpcGVfY29uZmlnLT5wY2hfcGZpdC5m b3JjZV90aHJ1ID0gZW5hYmxlOwogCQlpZiAocGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVyID09 IFRSQU5TQ09ERVJfRURQICYmCiAJCSAgICBwaXBlX2NvbmZpZy0+cGNoX3BmaXQuZW5hYmxlZCAh PSBlbmFibGUpCkBAIC0zNDMsOCArMzM2LDcgQEAgc3RhdGljIHZvaWQgaHN3X3BpcGVfQV9jcmNf d2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3RhdGljIGludCBpdmJfcGlw ZV9jcmNfY3RsX3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJZW51 bSBwaXBlIHBpcGUsCiAJCQkJZW51bSBpbnRlbF9waXBlX2NyY19zb3VyY2UgKnNvdXJjZSwKLQkJ CQl1MzIgKnZhbCwKLQkJCQlib29sIHNldF93YSkKKwkJCQl1MzIgKnZhbCkKIHsKIAlpZiAoKnNv dXJjZSA9PSBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfQVVUTykKIAkJKnNvdXJjZSA9IElOVEVMX1BJ UEVfQ1JDX1NPVVJDRV9QSVBFOwpAQCAtMzU3LDEwICszNDksNiBAQCBzdGF0aWMgaW50IGl2Yl9w aXBlX2NyY19jdGxfcmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJKnZh bCA9IFBJUEVfQ1JDX0VOQUJMRSB8IFBJUEVfQ1JDX1NPVVJDRV9TUFJJVEVfSVZCOwogCQlicmVh azsKIAljYXNlIElOVEVMX1BJUEVfQ1JDX1NPVVJDRV9QSVBFOgotCQlpZiAoc2V0X3dhICYmIChJ U19IQVNXRUxMKGRldl9wcml2KSB8fAotCQkgICAgIElTX0JST0FEV0VMTChkZXZfcHJpdikpICYm IHBpcGUgPT0gUElQRV9BKQotCQkJaHN3X3BpcGVfQV9jcmNfd2EoZGV2X3ByaXYsIHRydWUpOwot CiAJCSp2YWwgPSBQSVBFX0NSQ19FTkFCTEUgfCBQSVBFX0NSQ19TT1VSQ0VfUEZfSVZCOwogCQli cmVhazsKIAljYXNlIElOVEVMX1BJUEVfQ1JDX1NPVVJDRV9OT05FOgpAQCAtNDE4LDggKzQwNiw3 IEBAIHN0YXRpYyBpbnQgc2tsX3BpcGVfY3JjX2N0bF9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LAogCiBzdGF0aWMgaW50IGdldF9uZXdfY3JjX2N0bF9yZWcoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIGVudW0gcGlwZSBwaXBlLAotCQkJ ICAgICAgIGVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNlICpzb3VyY2UsIHUzMiAqdmFsLAotCQkJ ICAgICAgIGJvb2wgc2V0X3dhKQorCQkJICAgICAgIGVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNl ICpzb3VyY2UsIHUzMiAqdmFsKQogewogCWlmIChJU19HRU4oZGV2X3ByaXYsIDIpKQogCQlyZXR1 cm4gaTh4eF9waXBlX2NyY19jdGxfcmVnKHNvdXJjZSwgdmFsKTsKQEAgLTQzMCw3ICs0MTcsNyBA QCBzdGF0aWMgaW50IGdldF9uZXdfY3JjX2N0bF9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCWVsc2UgaWYgKElTX0dFTl9SQU5HRShkZXZfcHJpdiwgNSwgNikpCiAJCXJl dHVybiBpbGtfcGlwZV9jcmNfY3RsX3JlZyhzb3VyY2UsIHZhbCk7CiAJZWxzZSBpZiAoSU5URUxf R0VOKGRldl9wcml2KSA8IDkpCi0JCXJldHVybiBpdmJfcGlwZV9jcmNfY3RsX3JlZyhkZXZfcHJp diwgcGlwZSwgc291cmNlLCB2YWwsIHNldF93YSk7CisJCXJldHVybiBpdmJfcGlwZV9jcmNfY3Rs X3JlZyhkZXZfcHJpdiwgcGlwZSwgc291cmNlLCB2YWwpOwogCWVsc2UKIAkJcmV0dXJuIHNrbF9w aXBlX2NyY19jdGxfcmVnKGRldl9wcml2LCBwaXBlLCBzb3VyY2UsIHZhbCk7CiB9CkBAIC02MTgs NyArNjA1LDkgQEAgaW50IGludGVsX2NydGNfc2V0X2NyY19zb3VyY2Uoc3RydWN0IGRybV9jcnRj ICpjcnRjLCBjb25zdCBjaGFyICpzb3VyY2VfbmFtZSkKIAkJcmV0dXJuIC1FSU87CiAJfQogCi0J cmV0ID0gZ2V0X25ld19jcmNfY3RsX3JlZyhkZXZfcHJpdiwgY3J0Yy0+aW5kZXgsICZzb3VyY2Us ICZ2YWwsIHRydWUpOworCWludGVsX2NydGNfY3JjX3ByZXBhcmUoZGV2X3ByaXYsIGNydGMsIHNv dXJjZSAhPSBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfTk9ORSk7CisKKwlyZXQgPSBnZXRfbmV3X2Ny Y19jdGxfcmVnKGRldl9wcml2LCBjcnRjLT5pbmRleCwgJnNvdXJjZSwgJnZhbCk7CiAJaWYgKHJl dCAhPSAwKQogCQlnb3RvIG91dDsKIApAQCAtNjI5LDkgKzYxOCw2IEBAIGludCBpbnRlbF9jcnRj X3NldF9jcmNfc291cmNlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgY29uc3QgY2hhciAqc291cmNl X25hbWUpCiAJaWYgKCFzb3VyY2UpIHsKIAkJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8 IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQkJdmx2X3VuZG9fcGlwZV9zY3JhbWJsZV9yZXNl dChkZXZfcHJpdiwgY3J0Yy0+aW5kZXgpOwotCQllbHNlIGlmICgoSVNfSEFTV0VMTChkZXZfcHJp dikgfHwKLQkJCSAgSVNfQlJPQURXRUxMKGRldl9wcml2KSkgJiYgY3J0Yy0+aW5kZXggPT0gUElQ RV9BKQotCQkJaHN3X3BpcGVfQV9jcmNfd2EoZGV2X3ByaXYsIGZhbHNlKTsKIAl9CiAKIAlwaXBl X2NyYy0+c2tpcHBlZCA9IDA7CkBAIC02NTIsNyArNjM4LDcgQEAgdm9pZCBpbnRlbF9jcnRjX2Vu YWJsZV9waXBlX2NyYyhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKIAlpZiAoIWNydGMt PmNyYy5vcGVuZWQpCiAJCXJldHVybjsKIAotCWlmIChnZXRfbmV3X2NyY19jdGxfcmVnKGRldl9w cml2LCBjcnRjLT5pbmRleCwgJnBpcGVfY3JjLT5zb3VyY2UsICZ2YWwsIGZhbHNlKSA8IDApCisJ aWYgKGdldF9uZXdfY3JjX2N0bF9yZWcoZGV2X3ByaXYsIGNydGMtPmluZGV4LCAmcGlwZV9jcmMt PnNvdXJjZSwgJnZhbCkgPCAwKQogCQlyZXR1cm47CiAKIAkvKiBEb24ndCBuZWVkIHBpcGVfY3Jj LT5sb2NrIGhlcmUsIElSUXMgYXJlIG5vdCBnZW5lcmF0ZWQuICovCi0tIAoyLjIxLjAKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==