From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v4 5/9] drm/i915/crc: Make IPS workaround generic Date: Fri, 1 Mar 2019 17:34:52 -0800 Message-ID: <20190302013456.24138-5-jose.souza@intel.com> References: <20190302013456.24138-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 760386E32B for ; Sat, 2 Mar 2019 01:35:05 +0000 (UTC) In-Reply-To: <20190302013456.24138-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 ZSBvZiBhbGwgdGhlIGNoZWNrcyByZW1vdmVkCmZyb20gaGVyZS4KCnYyOiBSZW5hbWluZyBhbmQg cGFyYW1ldGVyIGNoYW5nZXMgdG8gdGhlIGZ1bmN0aW9ucyB0aGF0IHByZXBhcmVzIHRoZQpjb21t aXQgKFZpbGxlKQoKQ2M6IERoaW5ha2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5A aW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogSm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICB8IDEw ICsrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICB8ICAzICstCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jIHwgNDcgKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDMxIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA4MTZlOGYxMjRi M2IuLjMyODk2N2M2NDJiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt Njc1MSw3ICs2NzUxLDEzIEBAIHN0YXRpYyBib29sIGhzd19jb21wdXRlX2lwc19jb25maWcoc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJaWYgKCFoc3dfY3J0Y19zdGF0ZV9p cHNfY2FwYWJsZShjcnRjX3N0YXRlKSkKIAkJcmV0dXJuIGZhbHNlOwogCi0JaWYgKGNydGNfc3Rh dGUtPmlwc19mb3JjZV9kaXNhYmxlKQorCS8qCisJICogV2hlbiBJUFMgZ2V0cyBlbmFibGVkLCB0 aGUgcGlwZSBDUkMgY2hhbmdlcy4gU2luY2UgSVBTIGdldHMKKwkgKiBlbmFibGVkIGFuZCBkaXNh YmxlZCBkeW5hbWljYWxseSBiYXNlZCBvbiBwYWNrYWdlIEMgc3RhdGVzLAorCSAqIHVzZXIgc3Bh Y2UgY2FuJ3QgbWFrZSByZWxpYWJsZSB1c2Ugb2YgdGhlIENSQ3MsIHNvIGxldCdzIGp1c3QKKwkg KiBjb21wbGV0ZWx5IGRpc2FibGUgaXQuCisJICovCisJaWYgKGNydGNfc3RhdGUtPmNyY19lbmFi bGVkKQogCQlyZXR1cm4gZmFsc2U7CiAKIAkvKiBJUFMgc2hvdWxkIGJlIGZpbmUgYXMgbG9uZyBh cyBhdCBsZWFzdCBvbmUgcGxhbmUgaXMgZW5hYmxlZC4gKi8KQEAgLTExNjg0LDcgKzExNjkwLDcg QEAgY2xlYXJfaW50ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSkKIAlzYXZlZF9zdGF0ZS0+c2hhcmVkX2RwbGwgPSBjcnRjX3N0YXRlLT5zaGFyZWRfZHBs bDsKIAlzYXZlZF9zdGF0ZS0+ZHBsbF9od19zdGF0ZSA9IGNydGNfc3RhdGUtPmRwbGxfaHdfc3Rh dGU7CiAJc2F2ZWRfc3RhdGUtPnBjaF9wZml0LmZvcmNlX3RocnUgPSBjcnRjX3N0YXRlLT5wY2hf cGZpdC5mb3JjZV90aHJ1OwotCXNhdmVkX3N0YXRlLT5pcHNfZm9yY2VfZGlzYWJsZSA9IGNydGNf c3RhdGUtPmlwc19mb3JjZV9kaXNhYmxlOworCXNhdmVkX3N0YXRlLT5jcmNfZW5hYmxlZCA9IGNy dGNfc3RhdGUtPmNyY19lbmFibGVkOwogCWlmIChJU19HNFgoZGV2X3ByaXYpIHx8CiAJICAgIElT X1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlzYXZl ZF9zdGF0ZS0+d20gPSBjcnRjX3N0YXRlLT53bTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k ZXggNTQxMjM3M2UyZjk4Li4yYmU2NDUyOWU0YTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CkBAIC05OTksNyArOTk5LDggQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewogCXN0cnVjdCBp bnRlbF9saW5rX21fbiBmZGlfbV9uOwogCiAJYm9vbCBpcHNfZW5hYmxlZDsKLQlib29sIGlwc19m b3JjZV9kaXNhYmxlOworCisJYm9vbCBjcmNfZW5hYmxlZDsKIAogCWJvb2wgZW5hYmxlX2ZiYzsK IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGlwZV9jcmMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BpcGVfY3JjLmMKaW5kZXggNTNkNGVjNjhkM2M0Li5h ZjY0NTk3YzVjNmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BpcGVf Y3JjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcGlwZV9jcmMuYwpAQCAtMjgw LDE1ICsyODAsMTUgQEAgc3RhdGljIGludCBpbGtfcGlwZV9jcmNfY3RsX3JlZyhlbnVtIGludGVs X3BpcGVfY3JjX3NvdXJjZSAqc291cmNlLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBo c3dfcGlwZV9BX2NyY193YShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkg ICAgICBib29sIGVuYWJsZSkKK3N0YXRpYyB2b2lkCitpbnRlbF9jcnRjX2NyY19zZXR1cF93b3Jr YXJvdW5kcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywgYm9vbCBlbmFibGUpCiB7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CiAJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCXN0cnVjdCBpbnRlbF9j cnRjICpjcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BpcGUoZGV2X3ByaXYsIFBJUEVfQSk7CiAJ c3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnOwogCXN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZTsKIAlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4OwotCWlu dCByZXQgPSAwOworCWludCByZXQ7CiAKIAlkcm1fbW9kZXNldF9hY3F1aXJlX2luaXQoJmN0eCwg MCk7CiAKQEAgLTMwNywxNyArMzA3LDkgQEAgc3RhdGljIHZvaWQgaHN3X3BpcGVfQV9jcmNfd2Eo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlnb3RvIHB1dF9zdGF0ZTsKIAl9 CiAKLQlpZiAoSEFTX0lQUyhkZXZfcHJpdikpIHsKLQkJLyoKLQkJICogV2hlbiBJUFMgZ2V0cyBl bmFibGVkLCB0aGUgcGlwZSBDUkMgY2hhbmdlcy4gU2luY2UgSVBTIGdldHMKLQkJICogZW5hYmxl ZCBhbmQgZGlzYWJsZWQgZHluYW1pY2FsbHkgYmFzZWQgb24gcGFja2FnZSBDIHN0YXRlcywKLQkJ ICogdXNlciBzcGFjZSBjYW4ndCBtYWtlIHJlbGlhYmxlIHVzZSBvZiB0aGUgQ1JDcywgc28gbGV0 J3MganVzdAotCQkgKiBjb21wbGV0ZWx5IGRpc2FibGUgaXQuCi0JCSAqLwotCQlwaXBlX2NvbmZp Zy0+aXBzX2ZvcmNlX2Rpc2FibGUgPSBlbmFibGU7Ci0JfQorCXBpcGVfY29uZmlnLT5jcmNfZW5h YmxlZCA9IGVuYWJsZTsKIAotCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgeworCWlmIChJU19I QVNXRUxMKGRldl9wcml2KSAmJiBjcnRjLT5waXBlID09IFBJUEVfQSkgewogCQlwaXBlX2NvbmZp Zy0+cGNoX3BmaXQuZm9yY2VfdGhydSA9IGVuYWJsZTsKIAkJaWYgKHBpcGVfY29uZmlnLT5jcHVf dHJhbnNjb2RlciA9PSBUUkFOU0NPREVSX0VEUCAmJgogCQkgICAgcGlwZV9jb25maWctPnBjaF9w Zml0LmVuYWJsZWQgIT0gZW5hYmxlKQpAQCAtMzQzLDggKzMzNSw3IEBAIHN0YXRpYyB2b2lkIGhz d19waXBlX0FfY3JjX3dhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHN0YXRp YyBpbnQgaXZiX3BpcGVfY3JjX2N0bF9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCQkJCWVudW0gcGlwZSBwaXBlLAogCQkJCWVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNl ICpzb3VyY2UsCi0JCQkJdTMyICp2YWwsCi0JCQkJYm9vbCBzZXRfd2EpCisJCQkJdTMyICp2YWwp CiB7CiAJaWYgKCpzb3VyY2UgPT0gSU5URUxfUElQRV9DUkNfU09VUkNFX0FVVE8pCiAJCSpzb3Vy Y2UgPSBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfUElQRTsKQEAgLTM1NywxMCArMzQ4LDYgQEAgc3Rh dGljIGludCBpdmJfcGlwZV9jcmNfY3RsX3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCSp2YWwgPSBQSVBFX0NSQ19FTkFCTEUgfCBQSVBFX0NSQ19TT1VSQ0VfU1BSSVRF X0lWQjsKIAkJYnJlYWs7CiAJY2FzZSBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfUElQRToKLQkJaWYg KHNldF93YSAmJiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwKLQkJICAgICBJU19CUk9BRFdFTEwo ZGV2X3ByaXYpKSAmJiBwaXBlID09IFBJUEVfQSkKLQkJCWhzd19waXBlX0FfY3JjX3dhKGRldl9w cml2LCB0cnVlKTsKLQogCQkqdmFsID0gUElQRV9DUkNfRU5BQkxFIHwgUElQRV9DUkNfU09VUkNF X1BGX0lWQjsKIAkJYnJlYWs7CiAJY2FzZSBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfTk9ORToKQEAg LTQxOCw4ICs0MDUsNyBAQCBzdGF0aWMgaW50IHNrbF9waXBlX2NyY19jdGxfcmVnKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogc3RhdGljIGludCBnZXRfbmV3X2NyY19jdGxf cmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgICBlbnVtIHBp cGUgcGlwZSwKLQkJCSAgICAgICBlbnVtIGludGVsX3BpcGVfY3JjX3NvdXJjZSAqc291cmNlLCB1 MzIgKnZhbCwKLQkJCSAgICAgICBib29sIHNldF93YSkKKwkJCSAgICAgICBlbnVtIGludGVsX3Bp cGVfY3JjX3NvdXJjZSAqc291cmNlLCB1MzIgKnZhbCkKIHsKIAlpZiAoSVNfR0VOKGRldl9wcml2 LCAyKSkKIAkJcmV0dXJuIGk4eHhfcGlwZV9jcmNfY3RsX3JlZyhzb3VyY2UsIHZhbCk7CkBAIC00 MzAsNyArNDE2LDcgQEAgc3RhdGljIGludCBnZXRfbmV3X2NyY19jdGxfcmVnKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAllbHNlIGlmIChJU19HRU5fUkFOR0UoZGV2X3ByaXYs IDUsIDYpKQogCQlyZXR1cm4gaWxrX3BpcGVfY3JjX2N0bF9yZWcoc291cmNlLCB2YWwpOwogCWVs c2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA5KQotCQlyZXR1cm4gaXZiX3BpcGVfY3JjX2N0 bF9yZWcoZGV2X3ByaXYsIHBpcGUsIHNvdXJjZSwgdmFsLCBzZXRfd2EpOworCQlyZXR1cm4gaXZi X3BpcGVfY3JjX2N0bF9yZWcoZGV2X3ByaXYsIHBpcGUsIHNvdXJjZSwgdmFsKTsKIAllbHNlCiAJ CXJldHVybiBza2xfcGlwZV9jcmNfY3RsX3JlZyhkZXZfcHJpdiwgcGlwZSwgc291cmNlLCB2YWwp OwogfQpAQCAtNjA1LDYgKzU5MSw3IEBAIGludCBpbnRlbF9jcnRjX3NldF9jcmNfc291cmNlKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywgY29uc3QgY2hhciAqc291cmNlX25hbWUpCiAJaW50ZWxfd2Fr ZXJlZl90IHdha2VyZWY7CiAJdTMyIHZhbCA9IDA7IC8qIHNodXQgdXAgZ2NjICovCiAJaW50IHJl dCA9IDA7CisJYm9vbCBlbmFibGU7CiAKIAlpZiAoZGlzcGxheV9jcmNfY3RsX3BhcnNlX3NvdXJj ZShzb3VyY2VfbmFtZSwgJnNvdXJjZSkgPCAwKSB7CiAJCURSTV9ERUJVR19EUklWRVIoInVua25v d24gc291cmNlICVzXG4iLCBzb3VyY2VfbmFtZSk7CkBAIC02MTgsNyArNjA1LDExIEBAIGludCBp bnRlbF9jcnRjX3NldF9jcmNfc291cmNlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgY29uc3QgY2hh ciAqc291cmNlX25hbWUpCiAJCXJldHVybiAtRUlPOwogCX0KIAotCXJldCA9IGdldF9uZXdfY3Jj X2N0bF9yZWcoZGV2X3ByaXYsIGNydGMtPmluZGV4LCAmc291cmNlLCAmdmFsLCB0cnVlKTsKKwll bmFibGUgPSBzb3VyY2UgIT0gSU5URUxfUElQRV9DUkNfU09VUkNFX05PTkU7CisJaWYgKGVuYWJs ZSkKKwkJaW50ZWxfY3J0Y19jcmNfc2V0dXBfd29ya2Fyb3VuZHModG9faW50ZWxfY3J0YyhjcnRj KSwgZW5hYmxlKTsKKworCXJldCA9IGdldF9uZXdfY3JjX2N0bF9yZWcoZGV2X3ByaXYsIGNydGMt PmluZGV4LCAmc291cmNlLCAmdmFsKTsKIAlpZiAocmV0ICE9IDApCiAJCWdvdG8gb3V0OwogCkBA IC02MjksMTQgKzYyMCwxNCBAQCBpbnQgaW50ZWxfY3J0Y19zZXRfY3JjX3NvdXJjZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsIGNvbnN0IGNoYXIgKnNvdXJjZV9uYW1lKQogCWlmICghc291cmNlKSB7 CiAJCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2 KSkKIAkJCXZsdl91bmRvX3BpcGVfc2NyYW1ibGVfcmVzZXQoZGV2X3ByaXYsIGNydGMtPmluZGV4 KTsKLQkJZWxzZSBpZiAoKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8Ci0JCQkgIElTX0JST0FEV0VM TChkZXZfcHJpdikpICYmIGNydGMtPmluZGV4ID09IFBJUEVfQSkKLQkJCWhzd19waXBlX0FfY3Jj X3dhKGRldl9wcml2LCBmYWxzZSk7CiAJfQogCiAJcGlwZV9jcmMtPnNraXBwZWQgPSAwOwogCiBv dXQ6CisJaWYgKCFlbmFibGUpCisJCWludGVsX2NydGNfY3JjX3NldHVwX3dvcmthcm91bmRzKHRv X2ludGVsX2NydGMoY3J0YyksIGVuYWJsZSk7CisKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChk ZXZfcHJpdiwgcG93ZXJfZG9tYWluLCB3YWtlcmVmKTsKIAogCXJldHVybiByZXQ7CkBAIC02NTIs NyArNjQzLDcgQEAgdm9pZCBpbnRlbF9jcnRjX2VuYWJsZV9waXBlX2NyYyhzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YykKIAlpZiAoIWNydGMtPmNyYy5vcGVuZWQpCiAJCXJldHVybjsKIAot CWlmIChnZXRfbmV3X2NyY19jdGxfcmVnKGRldl9wcml2LCBjcnRjLT5pbmRleCwgJnBpcGVfY3Jj LT5zb3VyY2UsICZ2YWwsIGZhbHNlKSA8IDApCisJaWYgKGdldF9uZXdfY3JjX2N0bF9yZWcoZGV2 X3ByaXYsIGNydGMtPmluZGV4LCAmcGlwZV9jcmMtPnNvdXJjZSwgJnZhbCkgPCAwKQogCQlyZXR1 cm47CiAKIAkvKiBEb24ndCBuZWVkIHBpcGVfY3JjLT5sb2NrIGhlcmUsIElSUXMgYXJlIG5vdCBn ZW5lcmF0ZWQuICovCi0tIAoyLjIxLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeA==