From: Oscar Mateo Subject: [PATCH v3 11/22] drm/i915/cnl: Move GT and Display workarounds from init_clock_gating Date: Fri, 13 Oct 2017 13:54:05 -0700 Message-ID: <1507928056-6966-12-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 1A1EE6EBC8 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 VG8gdGhlaXIgcmlnaHRmdWwgcGxhY2UgaW5zaWRlIGludGVsX3dvcmthcm91bmRzLmMKClNpZ25l ZC1vZmYtYnk6IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRlb0BpbnRlbC5jb20+CkNjOiBSb2RyaWdv IFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXgu aW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgICAgIHwgMzIg Ky0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3dvcmthcm91bmRzLmMgfCAyNiArKysrKysrKysrKysrKysrKysrKysrKysrLQogMiBmaWxl cyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYwppbmRleCBlNGIzOTA0Li4zZjkyYmVkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCkBAIC04NTA5LDM2ICs4NTA5LDYgQEAgc3RhdGljIHZvaWQgY25wX2luaXRfY2xvY2tfZ2F0 aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJICAgQ05QX1BXTV9DR0Vf R0FUSU5HX0RJU0FCTEUpOwogfQogCi1zdGF0aWMgdm9pZCBjbmxfaW5pdF9jbG9ja19nYXRpbmco c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCXUzMiB2YWw7Ci0JY25wX2lu aXRfY2xvY2tfZ2F0aW5nKGRldl9wcml2KTsKLQotCS8qIFRoaXMgaXMgbm90IGFuIFdhLiBFbmFi bGUgZm9yIGJldHRlciBpbWFnZSBxdWFsaXR5ICovCi0JSTkxNV9XUklURShfM0RfQ0hJQ0tFTjMs Ci0JCSAgIF9NQVNLRURfQklUX0VOQUJMRShfM0RfQ0hJQ0tFTjNfQUFfTElORV9RVUFMSVRZX0ZJ WF9FTkFCTEUpKTsKLQotCS8qIFdhRW5hYmxlQ2hpY2tlbkRDUFI6Y25sICovCi0JSTkxNV9XUklU RShHRU44X0NISUNLRU5fRENQUl8xLAotCQkgICBJOTE1X1JFQUQoR0VOOF9DSElDS0VOX0RDUFJf MSkgfCBNQVNLX1dBS0VNRU0pOwotCi0JLyogV2FGYmNXYWtlTWVtT246Y25sICovCi0JSTkxNV9X UklURShESVNQX0FSQl9DVEwsIEk5MTVfUkVBRChESVNQX0FSQl9DVEwpIHwKLQkJICAgRElTUF9G QkNfTUVNT1JZX1dBS0UpOwotCi0JLyogV2FTYXJiVW5pdENsb2NrR2F0aW5nRGlzYWJsZTpjbmwg KHByZS1wcm9kKSAqLwotCWlmIChJU19DTkxfUkVWSUQoZGV2X3ByaXYsIENOTF9SRVZJRF9BMCwg Q05MX1JFVklEX0IwKSkKLQkJSTkxNV9XUklURShTTElDRV9VTklUX0xFVkVMX0NMS0dBVEUsCi0J CQkgICBJOTE1X1JFQUQoU0xJQ0VfVU5JVF9MRVZFTF9DTEtHQVRFKSB8Ci0JCQkgICBTQVJCVU5J VF9DTEtHQVRFX0RJUyk7Ci0KLQkvKiBEaXNwbGF5IFdBICMxMTMzOiBXYUZiY1NraXBTZWdtZW50 czpjbmwgKi8KLQl2YWwgPSBJOTE1X1JFQUQoSUxLX0RQRkNfQ0hJQ0tFTik7Ci0JdmFsICY9IH5H TEtfU0tJUF9TRUdfQ09VTlRfTUFTSzsKLQl2YWwgfD0gR0xLX1NLSVBfU0VHX0VOIHwgR0xLX1NL SVBfU0VHX0NPVU5UKDEpOwotCUk5MTVfV1JJVEUoSUxLX0RQRkNfQ0hJQ0tFTiwgdmFsKTsKLX0K LQogc3RhdGljIHZvaWQgY2ZsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIHsKIAljbnBfaW5pdF9jbG9ja19nYXRpbmcoZGV2X3ByaXYpOwpAQCAt OTAzMCw3ICs5MDAwLDcgQEAgc3RhdGljIHZvaWQgbm9wX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHZvaWQgaW50ZWxfaW5pdF9jbG9ja19nYXRp bmdfaG9va3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWlmIChJU19D QU5OT05MQUtFKGRldl9wcml2KSkKLQkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9jbG9ja19nYXRp bmcgPSBjbmxfaW5pdF9jbG9ja19nYXRpbmc7CisJCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xv Y2tfZ2F0aW5nID0gbm9wX2luaXRfY2xvY2tfZ2F0aW5nOwogCWVsc2UgaWYgKElTX0NPRkZFRUxB S0UoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGNm bF9pbml0X2Nsb2NrX2dhdGluZzsKIAllbHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSkKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCmluZGV4IGFlYTkzOTEuLjIyMmY0 NWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwpAQCAtNzI0LDYg KzcyNCwxMCBAQCBzdGF0aWMgaW50IGNmbF9ndF93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIGludCBjbmxfZ3Rfd29ya2Fyb3VuZHNf aW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CisJLyogVGhpcyBpcyBu b3QgYW4gV2EuIEVuYWJsZSBmb3IgYmV0dGVyIGltYWdlIHF1YWxpdHkgKi8KKwlHVF9XQV9TRVRf QklUX01BU0tFRChfM0RfQ0hJQ0tFTjMsCisJCQkgICAgIF8zRF9DSElDS0VOM19BQV9MSU5FX1FV QUxJVFlfRklYX0VOQUJMRSk7CisKIAkvKiBXYURpc2FibGVJMm1DeWNsZU9uV1JQb3J0OmNubCAo cHJlLXByb2QpICovCiAJaWYgKElTX0NOTF9SRVZJRChkZXZfcHJpdiwgQ05MX1JFVklEX0IwLCBD TkxfUkVWSURfQjApKQogCQlHVF9XQV9TRVRfQklUKEdBTVRfQ0hLTl9CSVRfUkVHLApAQCAtODU2 LDYgKzg2MCwyNyBAQCBzdGF0aWMgaW50IGNmbF9kaXNwbGF5X3dvcmthcm91bmRzX2luaXQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMgaW50IGNubF9kaXNwbGF5 X3dvcmthcm91bmRzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewor CWlmIChIQVNfUENIX0NOUChkZXZfcHJpdikpIHsKKwkJLyogV2EgIzExODEgKi8KKwkJRElTUExB WV9XQV9TRVRfQklUKFNPVVRIX0RTUENMS19HQVRFX0QsCisJCQkJICAgQ05QX1BXTV9DR0VfR0FU SU5HX0RJU0FCTEUpOworCX0KKworCS8qIFdhRW5hYmxlQ2hpY2tlbkRDUFI6Y25sICovCisJRElT UExBWV9XQV9TRVRfQklUKEdFTjhfQ0hJQ0tFTl9EQ1BSXzEsIE1BU0tfV0FLRU1FTSk7CisKKwkv KiBXYUZiY1dha2VNZW1PbjpjbmwgKi8KKwlESVNQTEFZX1dBX1NFVF9CSVQoRElTUF9BUkJfQ1RM LCBESVNQX0ZCQ19NRU1PUllfV0FLRSk7CisKKwkvKiBXYVNhcmJVbml0Q2xvY2tHYXRpbmdEaXNh YmxlOmNubCAocHJlLXByb2QpICovCisJaWYgKElTX0NOTF9SRVZJRChkZXZfcHJpdiwgQ05MX1JF VklEX0EwLCBDTkxfUkVWSURfQjApKQorCQlESVNQTEFZX1dBX1NFVF9CSVQoU0xJQ0VfVU5JVF9M RVZFTF9DTEtHQVRFLAorCQkJCSAgIFNBUkJVTklUX0NMS0dBVEVfRElTKTsKKworCS8qIERpc3Bs YXkgV0EgIzExMzM6IFdhRmJjU2tpcFNlZ21lbnRzOmNubCAqLworCURJU1BMQVlfV0FfU0VUX0ZJ RUxEKElMS19EUEZDX0NISUNLRU4sIEdMS19TS0lQX1NFR19DT1VOVF9NQVNLLAorCQkJICAgICBH TEtfU0tJUF9TRUdfRU4gfCBHTEtfU0tJUF9TRUdfQ09VTlQoMSkpOworCiAJcmV0dXJuIDA7CiB9 CiAKQEAgLTg2Myw3ICs4ODgsNiBAQCBzdGF0aWMgaW50IGRpc3BsYXlfd29ya2Fyb3VuZHNfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50IGVycjsKIAotCURJ U1BMQVlfV0FfU0VUX0JJVChfTU1JTygwKSwgMCk7IC8qIHNodXQgdXAgZ2NjIHRlbXBvcmFyaWx5 ICovCiAJZGV2X3ByaXYtPndvcmthcm91bmRzLmRpc3BsYXlfd2FfY291bnQgPSAwOwogCiAJaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPCA4KQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=