From: Nick Hoath Subject: [PATCH] drm/i915/bxt: Enable existing gen9 harware workarounds for Broxton Date: Tue, 7 Apr 2015 11:45:40 +0100 Message-ID: <1428403540-27040-1-git-send-email-nicholas.hoath@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 966406E552 for ; Tue, 7 Apr 2015 03:46:05 -0700 (PDT) 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 U2lnbmVkLW9mZi1ieTogTmljayBIb2F0aCA8bmljaG9sYXMuaG9hdGhAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICAgICB8ICA4ICsrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgICAgfCAgMiArKwogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNTMgKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDQxIGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IDdlMWEwZmQ5Li45MWVlZjA2IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTUzMzksNiArNTMzOSw3IEBAIGVudW0gc2tsX2Rpc3Bf cG93ZXJfd2VsbHMgewogCiAjZGVmaW5lIEdFTjhfTDNTUUNSRUc0CQkJCTB4YjExOAogI2RlZmlu ZSAgR0VOOF9MUVNDX1JPX1BFUkZfRElTCQkJKDE8PDI3KQorI2RlZmluZSAgR0VOOF9QSVBFTElO RV9GTFVTSF9DT0hFUkVOVF9MSU5FUwkoMTw8MjEpCiAKIC8qIEdFTjggY2hpY2tlbiAqLwogI2Rl ZmluZSBIRENfQ0hJQ0tFTjAJCQkJMHg3MzAwCkBAIC03MzI0LDQgKzczMjUsMTEgQEAgZW51bSBz a2xfZGlzcF9wb3dlcl93ZWxscyB7CiAjZGVmaW5lIF9QQUxFVFRFX0EgKGRldl9wcml2LT5pbmZv LmRpc3BsYXlfbW1pb19vZmZzZXQgKyAweGEwMDApCiAjZGVmaW5lIF9QQUxFVFRFX0IgKGRldl9w cml2LT5pbmZvLmRpc3BsYXlfbW1pb19vZmZzZXQgKyAweGE4MDApCiAKKy8qCisgKiBDaGlja2Vu IFJlZ2lzdGVycyBmb3IgTExDL2VMTEMgSG90IFNwb3R0aW5nIEF2b2lkYW5jZSBNb2RlIGZvcgor ICogM0QvTWVkaWEgQ29tcHJlc3NlZCBSZXNvdXJjZXMKKyAqLworI2RlZmluZSBHRU45X0NISUNL RU5fTUlTQzFfUkVHCQkJCTB4NDIwODAKKyNkZWZpbmUgR0VOOV9DSElDS0VOX01JU0MxX05FV19I QVNIX0VOQUJMRQkJKDE8PDE1KQorCiAjZW5kaWYgLyogX0k5MTVfUkVHX0hfICovCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwppbmRleCBjM2M0NzNkLi5iYmI1ZDY0IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKQEAgLTk2LDYgKzk2LDggQEAgc3RhdGljIHZvaWQgc2tsX2luaXRfY2xvY2tfZ2F0aW5n KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIHN0YXRpYyB2b2lkIGJ4dF9pbml0X2Nsb2NrX2dh dGluZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisKIAlnZW45X2luaXRfY2xvY2tfZ2F0aW5n KGRldik7CiAKIAkvKiBXYVZTUmVmQ291bnRGdWxsZm9yY2VNaXNzRGlzYWJsZTpieHQgKi8KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA0NGM3Yjk5Li43NDFiZGZh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC05MTYsNyArOTE2 LDcgQEAgc3RhdGljIGludCBnZW45X2luaXRfd29ya2Fyb3VuZHMoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZykKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2OwogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKLQkvKiBX YURpc2FibGVQYXJ0aWFsSW5zdFNob290ZG93bjpza2wgKi8KKwkvKiBXYURpc2FibGVQYXJ0aWFs SW5zdFNob290ZG93bjpza2wsYnh0ICovCiAJV0FfU0VUX0JJVF9NQVNLRUQoR0VOOF9ST1dfQ0hJ Q0tFTiwKIAkJCSAgUEFSVElBTF9JTlNUUlVDVElPTl9TSE9PVERPV05fRElTQUJMRSk7CiAKQEAg LTkyNCw0NSArOTI0LDQzIEBAIHN0YXRpYyBpbnQgZ2VuOV9pbml0X3dvcmthcm91bmRzKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJV0FfU0VUX0JJVF9NQVNLRUQoSEFMRl9TTElDRV9D SElDS0VOMywKIAkJCSAgR0VOOV9ESVNBQkxFX09DTF9PT0JfU1VQUFJFU1NfTE9HSUMpOwogCi0J aWYgKElOVEVMX1JFVklEKGRldikgPT0gU0tMX1JFVklEX0EwIHx8Ci0JICAgIElOVEVMX1JFVklE KGRldikgPT0gU0tMX1JFVklEX0IwKSB7Ci0JCS8qIFdhRGlzYWJsZURnTWlycm9yRml4SW5IYWxm U2xpY2VDaGlja2VuNTpza2wgKi8KKwlpZiAoCisJICAgIChJU19TS1lMQUtFKGRldikgJiYgKElO VEVMX1JFVklEKGRldikgPT0gU0tMX1JFVklEX0EwIHx8CisJICAgIElOVEVMX1JFVklEKGRldikg PT0gU0tMX1JFVklEX0IwKSkgfHwKKwkgICAgKElTX0JST1hUT04oZGV2KSAmJiBJTlRFTF9SRVZJ RChkZXYpID09IEJYVF9SRVZJRF9BMCkKKwkgICAgKSB7CisJCS8qIFdhRGlzYWJsZURnTWlycm9y Rml4SW5IYWxmU2xpY2VDaGlja2VuNTpza2wsYnh0ICovCiAJCVdBX0NMUl9CSVRfTUFTS0VEKEdF TjlfSEFMRl9TTElDRV9DSElDS0VONSwKIAkJCQkgIEdFTjlfREdfTUlSUk9SX0ZJWF9FTkFCTEUp OwogCX0KIAotCWlmIChJU19TS1lMQUtFKGRldikgJiYgSU5URUxfUkVWSUQoZGV2KSA8PSBTS0xf UkVWSURfQjApIHsKLQkJLyogV2FTZXREaXNhYmxlUGl4TWFza0NhbW1pbmdBbmRSaHdvSW5Db21t b25TbGljZUNoaWNrZW46c2tsICovCisJaWYgKAorCSAgICAoSVNfU0tZTEFLRShkZXYpICYmIElO VEVMX1JFVklEKGRldikgPD0gU0tMX1JFVklEX0IwKSB8fAorCSAgICAoSVNfQlJPWFRPTihkZXYp ICYmIElOVEVMX1JFVklEKGRldikgPT0gQlhUX1JFVklEX0EwKQorCSAgICkgeworCQkvKiBXYVNl dERpc2FibGVQaXhNYXNrQ2FtbWluZ0FuZFJod29JbkNvbW1vblNsaWNlQ2hpY2tlbjpza2wsYnh0 ICovCiAJCVdBX1NFVF9CSVRfTUFTS0VEKEdFTjdfQ09NTU9OX1NMSUNFX0NISUNLRU4xLAogCQkJ CSAgR0VOOV9SSFdPX09QVElNSVpBVElPTl9ESVNBQkxFKTsKIAkJV0FfU0VUX0JJVF9NQVNLRUQo R0VOOV9TTElDRV9DT01NT05fRUNPX0NISUNLRU4wLAogCQkJCSAgRElTQUJMRV9QSVhFTF9NQVNL X0NBTU1JTkcpOwogCX0KIAotCWlmIChJTlRFTF9SRVZJRChkZXYpID49IFNLTF9SRVZJRF9DMCkg ewotCQkvKiBXYUVuYWJsZVlWMTJCdWdGaXhJbkhhbGZTbGljZUNoaWNrZW43OnNrbCAqLworCWlm ICgKKwkgICAgKElTX1NLWUxBS0UoZGV2KSAmJiBJTlRFTF9SRVZJRChkZXYpID49IFNLTF9SRVZJ RF9DMCkgfHwKKwkgICAgKElTX0JST1hUT04oZGV2KSkKKwkgICApIHsKKwkJLyogV2FFbmFibGVZ VjEyQnVnRml4SW5IYWxmU2xpY2VDaGlja2VuNzpza2wsYnh0ICovCiAJCVdBX1NFVF9CSVRfTUFT S0VEKEdFTjlfSEFMRl9TTElDRV9DSElDS0VONywKIAkJCQkgIEdFTjlfRU5BQkxFX1lWMTJfQlVH RklYKTsKIAl9CiAKLQlpZiAoSU5URUxfUkVWSUQoZGV2KSA8PSBTS0xfUkVWSURfRDApIHsKLQkJ LyoKLQkJICpVc2UgRm9yY2UgTm9uLUNvaGVyZW50IHdoZW5ldmVyIGV4ZWN1dGluZyBhIDNEIGNv bnRleHQuIFRoaXMKLQkJICogaXMgYSB3b3JrYXJvdW5kIGZvciBhIHBvc3NpYmxlIGhhbmcgaW4g dGhlIHVubGlrZWx5IGV2ZW50Ci0JCSAqIGEgVExCIGludmFsaWRhdGlvbiBvY2N1cnMgZHVyaW5n IGEgUFNEIGZsdXNoLgotCQkgKi8KLQkJLyogV2FGb3JjZUVuYWJsZU5vbkNvaGVyZW50OnNrbCAq LwotCQlXQV9TRVRfQklUX01BU0tFRChIRENfQ0hJQ0tFTjAsCi0JCQkJICBIRENfRk9SQ0VfTk9O X0NPSEVSRU5UKTsKLQl9Ci0KLQkvKiBXYTR4NFNUQ09wdGltaXphdGlvbkRpc2FibGU6c2tsICov CisJLyogV2E0eDRTVENPcHRpbWl6YXRpb25EaXNhYmxlOnNrbCxieHQgKi8KIAlXQV9TRVRfQklU X01BU0tFRChDQUNIRV9NT0RFXzEsIEdFTjhfNHg0X1NUQ19PUFRJTUlaQVRJT05fRElTQUJMRSk7 CiAKLQkvKiBXYURpc2FibGVQYXJ0aWFsUmVzb2x2ZUluVmM6c2tsICovCisJLyogV2FEaXNhYmxl UGFydGlhbFJlc29sdmVJblZjOnNrbCxieHQgKi8KIAlXQV9TRVRfQklUX01BU0tFRChDQUNIRV9N T0RFXzEsIEdFTjlfUEFSVElBTF9SRVNPTFZFX0lOX1ZDX0RJU0FCTEUpOwogCi0JLyogV2FDY3NU bGJQcmVmZXRjaERpc2FibGU6c2tsICovCisJLyogV2FDY3NUbGJQcmVmZXRjaERpc2FibGU6c2ts LGJ4dCAqLwogCVdBX0NMUl9CSVRfTUFTS0VEKEdFTjlfSEFMRl9TTElDRV9DSElDS0VONSwKIAkJ CSAgR0VOOV9DQ1NfVExCX1BSRUZFVENIX0VOQUJMRSk7CiAKQEAgLTEwMjQsNiArMTAyMiwxNyBA QCBzdGF0aWMgaW50IHNrbF9pbml0X3dvcmthcm91bmRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCiAJCVdBX1NFVF9CSVRfTUFTS0VEKEhJWl9DSElDS0VOLAogCQkJCSAgQkRXX0hJWl9Q T1dFUl9DT01QSUxFUl9DTE9DS19HQVRJTkdfRElTQUJMRSk7CiAKKwlpZiAoSU5URUxfUkVWSUQo ZGV2KSA8PSBTS0xfUkVWSURfRDApIHsKKwkJLyoKKwkJICpVc2UgRm9yY2UgTm9uLUNvaGVyZW50 IHdoZW5ldmVyIGV4ZWN1dGluZyBhIDNEIGNvbnRleHQuIFRoaXMKKwkJICogaXMgYSB3b3JrYXJv dW5kIGZvciBhIHBvc3NpYmxlIGhhbmcgaW4gdGhlIHVubGlrZWx5IGV2ZW50CisJCSAqIGEgVExC IGludmFsaWRhdGlvbiBvY2N1cnMgZHVyaW5nIGEgUFNEIGZsdXNoLgorCQkgKi8KKwkJLyogV2FG b3JjZUVuYWJsZU5vbkNvaGVyZW50OnNrbCAqLworCQlXQV9TRVRfQklUX01BU0tFRChIRENfQ0hJ Q0tFTjAsCisJCQkJICBIRENfRk9SQ0VfTk9OX0NPSEVSRU5UKTsKKwl9CisKIAlyZXR1cm4gc2ts X3R1bmVfaXpfaGFzaGluZyhyaW5nKTsKIH0KIAotLSAKMi4xLjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==