From: Oscar Mateo Subject: [PATCH v3 21/22] drm/i915: Move WaProgramL3SqcReg1Default to the workarounds file Date: Fri, 13 Oct 2017 13:54:15 -0700 Message-ID: <1507928056-6966-22-git-send-email-oscar.mateo@intel.com> References: <1507928056-6966-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D4EA6E0CD for ; Fri, 13 Oct 2017 20:54:15 +0000 (UTC) In-Reply-To: <1507928056-6966-1-git-send-email-oscar.mateo@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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org VGhpcyBtZWFucyBtb3ZpbmcgV2FUZW1wRGlzYWJsZURPUENsa0dhdGluZyBhcyB3ZWxsLgoKTm90 aWNlIHRoYXQgQlhUIGltcGxlbWVudHMgYSBzaW1pbGFyIFdBIHRvIFdhUHJvZ3JhbUwzU3FjUmVn MURlZmF1bHQKYnV0LCBhY2NvcmRpbmcgdG8gdGhlIEJTcGVjLCBpdCBkb2VzIG5vdCByZXF1aXJl IFdhVGVtcERpc2FibGVET1BDbGtHYXRpbmcuCgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8 b3NjYXIubWF0ZW9AaW50ZWwuY29tPgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50 ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBN aWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBJbXJlIERlYWsgPGlt cmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAg ICAgICAgICB8IDQ2ICsrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jIHwgNDQgKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDQ1IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDI5NmZlODMuLjc0Y2MyZmZlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTgzNzgsMzkgKzgzNzgsMTAgQEAgc3RhdGljIHZvaWQg bHB0X3N1c3BlbmRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCX0KIH0K IAotc3RhdGljIHZvaWQgZ2VuOF9zZXRfbDNzcWNfY3JlZGl0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCi0JCQkJICAgaW50IGdlbmVyYWxfcHJpb19jcmVkaXRzLAotCQkJCSAg IGludCBoaWdoX3ByaW9fY3JlZGl0cykKLXsKLQl1MzIgdmFsOwotCXUzMiBtaXNjY3BjdGw7Ci0K LQkvKiBXYVRlbXBEaXNhYmxlRE9QQ2xrR2F0aW5nOmJkdyAqLwotCW1pc2NjcGN0bCA9IEk5MTVf UkVBRChHRU43X01JU0NDUENUTCk7Ci0JSTkxNV9XUklURShHRU43X01JU0NDUENUTCwgbWlzY2Nw Y3RsICYgfkdFTjdfRE9QX0NMT0NLX0dBVEVfRU5BQkxFKTsKLQotCXZhbCA9IEk5MTVfUkVBRChH RU44X0wzU1FDUkVHMSk7Ci0JdmFsICY9IH5MM19QUklPX0NSRURJVFNfTUFTSzsKLQl2YWwgfD0g TDNfR0VORVJBTF9QUklPX0NSRURJVFMoZ2VuZXJhbF9wcmlvX2NyZWRpdHMpOwotCXZhbCB8PSBM M19ISUdIX1BSSU9fQ1JFRElUUyhoaWdoX3ByaW9fY3JlZGl0cyk7Ci0JSTkxNV9XUklURShHRU44 X0wzU1FDUkVHMSwgdmFsKTsKLQotCS8qCi0JICogV2FpdCBhdCBsZWFzdCAxMDAgY2xvY2tzIGJl Zm9yZSByZS1lbmFibGluZyBjbG9jayBnYXRpbmcuCi0JICogU2VlIHRoZSBkZWZpbml0aW9uIG9m IEwzU1FDUkVHMSBpbiBCU3BlYy4KLQkgKi8KLQlQT1NUSU5HX1JFQUQoR0VOOF9MM1NRQ1JFRzEp OwotCXVkZWxheSgxKTsKLQlJOTE1X1dSSVRFKEdFTjdfTUlTQ0NQQ1RMLCBtaXNjY3BjdGwpOwot fQotCiBzdGF0aWMgdm9pZCBiZHdfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewogCWlsa19pbml0X2xwX3dhdGVybWFya3MoZGV2X3ByaXYpOwog Ci0JLyogV2FQcm9ncmFtTDNTcWNSZWcxRGVmYXVsdDpiZHcgKi8KLQlnZW44X3NldF9sM3NxY19j cmVkaXRzKGRldl9wcml2LCAzMCwgMik7Ci0KIAlscHRfaW5pdF9jbG9ja19nYXRpbmcoZGV2X3By aXYpOwogfQogCkBAIC04NjQ1LDE2ICs4NjE2LDYgQEAgc3RhdGljIHZvaWQgdmx2X2luaXRfY2xv Y2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlJOTE1X1dSSVRF KFZMVl9HVU5JVF9DTE9DS19HQVRFLCBHQ0ZHX0RJUyk7CiB9CiAKLXN0YXRpYyB2b2lkIGNodl9p bml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCi17Ci0J LyoKLQkgKiBXYVByb2dyYW1MM1NxY1JlZzFEZWZhdWx0OmNodgotCSAqIFNlZSBnZnhzcGVjcy9S ZWxhdGVkIERvY3VtZW50cy9QZXJmb3JtYW5jZSBHdWlkZS8KLQkgKiBMU1FDIFNldHRpbmcgUmVj b21tZW5kYXRpb25zLgotCSAqLwotCWdlbjhfc2V0X2wzc3FjX2NyZWRpdHMoZGV2X3ByaXYsIDM4 LCAyKTsKLX0KLQogc3RhdGljIHZvaWQgZzR4X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAl1aW50MzJfdCBkc3BjbGtfZ2F0ZTsKQEAgLTg3 ODIsMTMgKzg3NDMsMTIgQEAgc3RhdGljIHZvaWQgbm9wX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHZvaWQgaW50ZWxfaW5pdF9jbG9ja19nYXRp bmdfaG9va3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWlmIChJU19D QU5OT05MQUtFKGRldl9wcml2KSB8fCBJU19DT0ZGRUVMQUtFKGRldl9wcml2KSB8fAotCSAgICBJ U19HRU1JTklMQUtFKGRldl9wcml2KSB8fCBJU19LQUJZTEFLRShkZXZfcHJpdikgfHwKLQkgICAg SVNfQlJPWFRPTihkZXZfcHJpdikgfHwgSVNfU0tZTEFLRShkZXZfcHJpdikpCisJICAgIElTX0dF TUlOSUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSAgIHx8CisJICAgIElT X0JST1hUT04oZGV2X3ByaXYpICAgIHx8IElTX1NLWUxBS0UoZGV2X3ByaXYpICAgIHx8CisJICAg IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2Nr X2dhdGluZyA9IG5vcF9pbml0X2Nsb2NrX2dhdGluZzsKIAllbHNlIGlmIChJU19CUk9BRFdFTEwo ZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGJkd19p bml0X2Nsb2NrX2dhdGluZzsKLQllbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKLQkJ ZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBjaHZfaW5pdF9jbG9ja19nYXRp bmc7CiAJZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5 LmluaXRfY2xvY2tfZ2F0aW5nID0gaHN3X2luaXRfY2xvY2tfZ2F0aW5nOwogCWVsc2UgaWYgKElT X0lWWUJSSURHRShkZXZfcHJpdikpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF93b3JrYXJvdW5kcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3Vu ZHMuYwppbmRleCBjYTlkOTA2Li4xMzZmNmZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3dvcmthcm91bmRzLmMKQEAgLTUxNywxMSArNTE3LDMzIEBAIHN0YXRpYyB2b2lkIG1taW9fd29y a2Fyb3VuZHNfYXBwbHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAg IHN0cnVjdCBpOTE1X3dhX3JlZyAqd2EsCiAJCQkJICAgdTMyIGNvdW50KQogeworCXUzMiBtaXNj Y3BjdGw7CisJdTMyIHZhbHVlOwogCWludCBpOwogCiAJZm9yIChpID0gMDsgaSA8IGNvdW50OyBp KyspIHsKLQkJdTMyIHZhbHVlID0gSTkxNV9SRUFEKHdhW2ldLmFkZHIpOworCQkvKiBXYVRlbXBE aXNhYmxlRE9QQ2xrR2F0aW5nICovCisJCWlmICgoSVNfQlJPQURXRUxMKGRldl9wcml2KSB8fCBJ U19DSEVSUllWSUVXKGRldl9wcml2KSkgJiYKKwkJICAgIGk5MTVfbW1pb19yZWdfZXF1YWwod2Fb aV0uYWRkciwgR0VOOF9MM1NRQ1JFRzEpKSB7CisJCQltaXNjY3BjdGwgPSBJOTE1X1JFQUQoR0VO N19NSVNDQ1BDVEwpOworCQkJSTkxNV9XUklURShHRU43X01JU0NDUENUTCwKKwkJCQkgICBtaXNj Y3BjdGwgJiB+R0VON19ET1BfQ0xPQ0tfR0FURV9FTkFCTEUpOworCQl9CisKKwkJdmFsdWUgPSBJ OTE1X1JFQUQod2FbaV0uYWRkcik7CiAJCUk5MTVfV1JJVEUod2FbaV0uYWRkciwgKHZhbHVlICYg fndhW2ldLm1hc2spIHwgd2FbaV0udmFsdWUpOworCisJCS8qIFdhVGVtcERpc2FibGVET1BDbGtH YXRpbmcgKi8KKwkJaWYgKChJU19CUk9BRFdFTEwoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVco ZGV2X3ByaXYpKSAmJgorCQkgICAgaTkxNV9tbWlvX3JlZ19lcXVhbCh3YVtpXS5hZGRyLCBHRU44 X0wzU1FDUkVHMSkpIHsKKwkJCS8qCisJCQkgKiBXYWl0IGF0IGxlYXN0IDEwMCBjbG9ja3MgYmVm b3JlIHJlLWVuYWJsaW5nIGNsb2NrCisJCQkgKiBnYXRpbmcgU2VlIHRoZSBkZWZpbml0aW9uIG9m IEwzU1FDUkVHMSBpbiBCU3BlYy4KKwkJCSAqLworCQkJUE9TVElOR19SRUFEKEdFTjhfTDNTUUNS RUcxKTsKKwkJCXVkZWxheSgxKTsKKwkJCUk5MTVfV1JJVEUoR0VON19NSVNDQ1BDVEwsIG1pc2Nj cGN0bCk7CisJCX0KIAl9CiB9CiAKQEAgLTU4Miw2ICs2MDQsMTQgQEAgc3RhdGljIGludCBiZHdf Z3Rfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ R1RfV0FfU0VUX0ZJRUxEKEhTV19HVFRfQ0FDSEVfRU4sIDB4RkZGRkZGRkYsCiAJCQljYW5fdXNl X2d0dF9jYWNoZSA/IEdUVF9DQUNIRV9FTl9BTEwgOiAwKTsKIAorCS8qCisJICogV2FQcm9ncmFt TDNTcWNSZWcxRGVmYXVsdDpiZHcKKwkgKiBTZWUgImdmeHNwZWNzL1JlbGF0ZWQgRG9jdW1lbnRz L1BlcmZvcm1hbmNlIEd1aWRlL0xTUUMgU2V0dGluZworCSAqIFJlY29tbWVuZGF0aW9ucyIgYW5k IGFsc28gV2FUZW1wRGlzYWJsZURPUENsa0dhdGluZy4KKwkgKi8KKwlHVF9XQV9TRVRfRklFTEQo R0VOOF9MM1NRQ1JFRzEsIEwzX1BSSU9fQ1JFRElUU19NQVNLLAorCQkJTDNfR0VORVJBTF9QUklP X0NSRURJVFMoMzApIHwgTDNfSElHSF9QUklPX0NSRURJVFMoMikpOworCiAJcmV0dXJuIDA7CiB9 CiAKQEAgLTYwMiw2ICs2MzIsMTQgQEAgc3RhdGljIGludCBjaHZfZ3Rfd29ya2Fyb3VuZHNfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICovCiAJR1RfV0FfU0VUX0ZJ RUxEKEhTV19HVFRfQ0FDSEVfRU4sIDB4RkZGRkZGRkYsIEdUVF9DQUNIRV9FTl9BTEwpOwogCisJ LyoKKwkgKiBXYVByb2dyYW1MM1NxY1JlZzFEZWZhdWx0OmNodgorCSAqIFNlZSAiZ2Z4c3BlY3Mv UmVsYXRlZCBEb2N1bWVudHMvUGVyZm9ybWFuY2UgR3VpZGUvTFNRQyBTZXR0aW5nCisJICogUmVj b21tZW5kYXRpb25zIiBhbmQgYWxzbyBXYVRlbXBEaXNhYmxlRE9QQ2xrR2F0aW5nLgorCSAqLwor CUdUX1dBX1NFVF9GSUVMRChHRU44X0wzU1FDUkVHMSwgTDNfUFJJT19DUkVESVRTX01BU0ssCisJ CQlMM19HRU5FUkFMX1BSSU9fQ1JFRElUUygzOCkgfCBMM19ISUdIX1BSSU9fQ1JFRElUUygyKSk7 CisKIAlyZXR1cm4gMDsKIH0KIApAQCAtNjg2LDcgKzcyNCw5IEBAIHN0YXRpYyBpbnQgYnh0X2d0 X3dvcmthcm91bmRzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkJ CSAgICAgR0VOOV9QT09MRURfRVVfTE9BRF9CQUxBTkNJTkdfRklYX0RJU0FCTEUpOwogCX0KIAot CS8qIFdhUHJvZ3JhbUwzU3FjUmVnMURlZmF1bHRGb3JQZXJmOmJ4dCAqLworCS8qCisJICogV2FQ cm9ncmFtTDNTcWNSZWcxRGVmYXVsdEZvclBlcmY6Ynh0CisJICovCiAJaWYgKElTX0JYVF9SRVZJ RChkZXZfcHJpdiwgQlhUX1JFVklEX0IwLCBSRVZJRF9GT1JFVkVSKSkKIAkJR1RfV0FfU0VUX0ZJ RUxEKEdFTjhfTDNTUUNSRUcxLCBMM19QUklPX0NSRURJVFNfTUFTSywKIAkJCQlMM19HRU5FUkFM X1BSSU9fQ1JFRElUUyg2MikgfAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=