From: Oscar Mateo Subject: [PATCH v3 12/22] drm/i915/gen9: Move GT and Display workarounds from init_clock_gating Date: Fri, 13 Oct 2017 13:54:06 -0700 Message-ID: <1507928056-6966-13-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0025B6EBC8 for ; Fri, 13 Oct 2017 20:54:13 +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 LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgICAgIHwgNTEg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF93b3JrYXJvdW5kcy5jIHwgNTQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIg ZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygrKSwgNTEgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKaW5kZXggM2Y5MmJlZDEuLmVmNzQyNTEgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwpAQCAtNTcsNTMgKzU3LDggQEAKICNkZWZpbmUgSU5URUxfUkM2cF9FTkFCTEUJCQko MTw8MSkKICNkZWZpbmUgSU5URUxfUkM2cHBfRU5BQkxFCQkJKDE8PDIpCiAKLXN0YXRpYyB2b2lk IGdlbjlfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQotewotCWlmIChIQVNfTExDKGRldl9wcml2KSkgewotCQkvKgotCQkgKiBXYUNvbXByZXNzZWRS ZXNvdXJjZURpc3BsYXlOZXdIYXNoTW9kZTpza2wsa2JsCi0JCSAqIERpc3BsYXkgV0EjMDM5MDog c2tsLGtibAotCQkgKgotCQkgKiBNdXN0IG1hdGNoIFNhbXBsZXIsIFBpeGVsIEJhY2sgRW5kLCBh bmQgTWVkaWEuIFNlZQotCQkgKiBXYUNvbXByZXNzZWRSZXNvdXJjZVNhbXBsZXJQYmVNZWRpYU5l d0hhc2hNb2RlLgotCQkgKi8KLQkJSTkxNV9XUklURShDSElDS0VOX1BBUjFfMSwKLQkJCSAgIEk5 MTVfUkVBRChDSElDS0VOX1BBUjFfMSkgfAotCQkJICAgU0tMX0RFX0NPTVBSRVNTRURfSEFTSF9N T0RFKTsKLQl9Ci0KLQkvKiBTZWUgQnNwZWMgbm90ZSBmb3IgUFNSMl9DVEwgYml0IDMxLCBXYSM4 Mjg6c2tsLGJ4dCxrYmwsY2ZsICovCi0JSTkxNV9XUklURShDSElDS0VOX1BBUjFfMSwKLQkJICAg STkxNV9SRUFEKENISUNLRU5fUEFSMV8xKSB8IFNLTF9FRFBfUFNSX0ZJWF9SRFdSQVApOwotCi0J STkxNV9XUklURShHRU44X0NPTkZJRzAsCi0JCSAgIEk5MTVfUkVBRChHRU44X0NPTkZJRzApIHwg R0VOOV9ERUZBVUxUX0ZJWEVTKTsKLQotCS8qIFdhRW5hYmxlQ2hpY2tlbkRDUFI6c2tsLGJ4dCxr YmwsZ2xrLGNmbCAqLwotCUk5MTVfV1JJVEUoR0VOOF9DSElDS0VOX0RDUFJfMSwKLQkJICAgSTkx NV9SRUFEKEdFTjhfQ0hJQ0tFTl9EQ1BSXzEpIHwgTUFTS19XQUtFTUVNKTsKLQotCS8qIFdhRmJj VHVybk9mZkZiY1dhdGVybWFyazpza2wsYnh0LGtibCxjZmwgKi8KLQkvKiBXYUZiY1dha2VNZW1P bjpza2wsYnh0LGtibCxnbGssY2ZsICovCi0JSTkxNV9XUklURShESVNQX0FSQl9DVEwsIEk5MTVf UkVBRChESVNQX0FSQl9DVEwpIHwKLQkJICAgRElTUF9GQkNfV01fRElTIHwKLQkJICAgRElTUF9G QkNfTUVNT1JZX1dBS0UpOwotCi0JLyogV2FGYmNIaWdoTWVtQndDb3JydXB0aW9uQXZvaWRhbmNl OnNrbCxieHQsa2JsLGNmbCAqLwotCUk5MTVfV1JJVEUoSUxLX0RQRkNfQ0hJQ0tFTiwgSTkxNV9S RUFEKElMS19EUEZDX0NISUNLRU4pIHwKLQkJICAgSUxLX0RQRkNfRElTQUJMRV9EVU1NWTApOwot Ci0JaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKSB7Ci0JCS8qIFdhRGlzYWJsZURvcENsb2NrR2F0 aW5nICovCi0JCUk5MTVfV1JJVEUoR0VON19NSVNDQ1BDVEwsIEk5MTVfUkVBRChHRU43X01JU0ND UENUTCkKLQkJCSAgICYgfkdFTjdfRE9QX0NMT0NLX0dBVEVfRU5BQkxFKTsKLQl9Ci19Ci0KIHN0 YXRpYyB2b2lkIGJ4dF9pbml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7Ci0JZ2VuOV9pbml0X2Nsb2NrX2dhdGluZyhkZXZfcHJpdik7Ci0KIAkvKiBX YURpc2FibGVTREVVbml0Q2xvY2tHYXRpbmc6Ynh0ICovCiAJSTkxNV9XUklURShHRU44X1VDR0NU TDYsIEk5MTVfUkVBRChHRU44X1VDR0NUTDYpIHwKIAkJICAgR0VOOF9TREVVTklUX0NMT0NLX0dB VEVfRElTQUJMRSk7CkBAIC0xMjYsNyArODEsNiBAQCBzdGF0aWMgdm9pZCBieHRfaW5pdF9jbG9j a19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogc3RhdGljIHZvaWQg Z2xrX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKIAl1MzIgdmFsOwotCWdlbjlfaW5pdF9jbG9ja19nYXRpbmcoZGV2X3ByaXYpOwogCiAJLyoK IAkgKiBXYURpc2FibGVQV01DbG9ja0dhdGluZzpnbGsKQEAgLTg1MTIsNyArODQ2Niw2IEBAIHN0 YXRpYyB2b2lkIGNucF9pbml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiBzdGF0aWMgdm9pZCBjZmxfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWNucF9pbml0X2Nsb2NrX2dhdGluZyhkZXZfcHJp dik7Ci0JZ2VuOV9pbml0X2Nsb2NrX2dhdGluZyhkZXZfcHJpdik7CiAKIAkvKiBXYUZiY051a2VP bkhvc3RNb2RpZnk6Y2ZsICovCiAJSTkxNV9XUklURShJTEtfRFBGQ19DSElDS0VOLCBJOTE1X1JF QUQoSUxLX0RQRkNfQ0hJQ0tFTikgfApAQCAtODUyMSw4ICs4NDc0LDYgQEAgc3RhdGljIHZvaWQg Y2ZsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAogc3RhdGljIHZvaWQga2JsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIHsKLQlnZW45X2luaXRfY2xvY2tfZ2F0aW5nKGRldl9wcml2KTsKLQog CS8qIFdhRGlzYWJsZVNERVVuaXRDbG9ja0dhdGluZzprYmwgKi8KIAlpZiAoSVNfS0JMX1JFVklE KGRldl9wcml2LCAwLCBLQkxfUkVWSURfQjApKQogCQlJOTE1X1dSSVRFKEdFTjhfVUNHQ1RMNiwg STkxNV9SRUFEKEdFTjhfVUNHQ1RMNikgfApAQCAtODU0MCw4ICs4NDkxLDYgQEAgc3RhdGljIHZv aWQga2JsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAogc3RhdGljIHZvaWQgc2tsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIHsKLQlnZW45X2luaXRfY2xvY2tfZ2F0aW5nKGRldl9wcml2KTsK LQogCS8qIFdBQzZlbnRyeWxhdGVuY3k6c2tsICovCiAJSTkxNV9XUklURShGQkNfTExDX1JFQURf Q1RSTCwgSTkxNV9SRUFEKEZCQ19MTENfUkVBRF9DVFJMKSB8CiAJCSAgIEZCQ19MTENfRlVMTFlf T1BFTik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5k cy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwppbmRleCAyMjJm NDVjLi41YzliMzEyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3Jr YXJvdW5kcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMK QEAgLTU3Myw2ICs1NzMsOCBAQCBzdGF0aWMgaW50IGNodl9ndF93b3JrYXJvdW5kc19pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIGludCBnZW45X2d0X3dv cmthcm91bmRzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogeworCUdU X1dBX1NFVF9CSVQoR0VOOF9DT05GSUcwLCBHRU45X0RFRkFVTFRfRklYRVMpOworCiAJaWYgKEhB U19MTEMoZGV2X3ByaXYpKSB7CiAJCS8qIFdhQ29tcHJlc3NlZFJlc291cmNlU2FtcGxlclBiZU1l ZGlhTmV3SGFzaE1vZGU6c2tsLGtibAogCQkgKgpAQCAtODMzLDI4ICs4MzUsODAgQEAgc3RhdGlj IGludCBjaHZfZGlzcGxheV93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIGludCBnZW45X2Rpc3BsYXlfd29y a2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJaWYg KEhBU19MTEMoZGV2X3ByaXYpKSB7CisJCS8qCisJCSAqIFdhQ29tcHJlc3NlZFJlc291cmNlRGlz cGxheU5ld0hhc2hNb2RlOnNrbCxrYmwKKwkJICogRGlzcGxheSBXQSMwMzkwOiBza2wsa2JsCisJ CSAqCisJCSAqIE11c3QgbWF0Y2ggU2FtcGxlciwgUGl4ZWwgQmFjayBFbmQsIGFuZCBNZWRpYS4g U2VlCisJCSAqIFdhQ29tcHJlc3NlZFJlc291cmNlU2FtcGxlclBiZU1lZGlhTmV3SGFzaE1vZGUu CisJCSAqLworCQlESVNQTEFZX1dBX1NFVF9CSVQoQ0hJQ0tFTl9QQVIxXzEsIFNLTF9ERV9DT01Q UkVTU0VEX0hBU0hfTU9ERSk7CisJfQorCisJLyogU2VlIEJzcGVjIG5vdGUgZm9yIFBTUjJfQ1RM IGJpdCAzMSwgV2EjODI4OnNrbCxieHQsa2JsLGNmbCAqLworCURJU1BMQVlfV0FfU0VUX0JJVChD SElDS0VOX1BBUjFfMSwgU0tMX0VEUF9QU1JfRklYX1JEV1JBUCk7CisKKwkvKiBXYUVuYWJsZUNo aWNrZW5EQ1BSOnNrbCxieHQsa2JsLGdsayxjZmwgKi8KKwlESVNQTEFZX1dBX1NFVF9CSVQoR0VO OF9DSElDS0VOX0RDUFJfMSwgTUFTS19XQUtFTUVNKTsKKworCS8qIFdhRmJjVHVybk9mZkZiY1dh dGVybWFyazpza2wsYnh0LGtibCxjZmwgKi8KKwkvKiBXYUZiY1dha2VNZW1Pbjpza2wsYnh0LGti bCxnbGssY2ZsICovCisJRElTUExBWV9XQV9TRVRfQklUKERJU1BfQVJCX0NUTCwgRElTUF9GQkNf V01fRElTIHwgRElTUF9GQkNfTUVNT1JZX1dBS0UpOworCisJLyogV2FGYmNIaWdoTWVtQndDb3Jy dXB0aW9uQXZvaWRhbmNlOnNrbCxieHQsa2JsLGNmbCAqLworCURJU1BMQVlfV0FfU0VUX0JJVChJ TEtfRFBGQ19DSElDS0VOLCBJTEtfRFBGQ19ESVNBQkxFX0RVTU1ZMCk7CisKKwlyZXR1cm4gMDsK K30KKwogc3RhdGljIGludCBza2xfZGlzcGxheV93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKKwlpbnQgcmV0ID0gZ2VuOV9kaXNwbGF5X3dvcmth cm91bmRzX2luaXQoZGV2X3ByaXYpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKKwkvKiBX YURpc2FibGVEb3BDbG9ja0dhdGluZyAqLworCURJU1BMQVlfV0FfQ0xSX0JJVChHRU43X01JU0ND UENUTCwgR0VON19ET1BfQ0xPQ0tfR0FURV9FTkFCTEUpOworCiAJcmV0dXJuIDA7CiB9CiAKIHN0 YXRpYyBpbnQgYnh0X2Rpc3BsYXlfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7CisJaW50IHJldCA9IGdlbjlfZGlzcGxheV93b3JrYXJvdW5kc19p bml0KGRldl9wcml2KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJcmV0dXJuIDA7CiB9 CiAKIHN0YXRpYyBpbnQga2JsX2Rpc3BsYXlfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CisJaW50IHJldCA9IGdlbjlfZGlzcGxheV93b3JrYXJv dW5kc19pbml0KGRldl9wcml2KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJcmV0dXJu IDA7CiB9CiAKIHN0YXRpYyBpbnQgZ2xrX2Rpc3BsYXlfd29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CisJaW50IHJldCA9IGdlbjlfZGlzcGxheV93 b3JrYXJvdW5kc19pbml0KGRldl9wcml2KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCiAJ cmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBpbnQgY2ZsX2Rpc3BsYXlfd29ya2Fyb3VuZHNfaW5pdChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CisJaW50IHJldCA9IGdlbjlfZGlz cGxheV93b3JrYXJvdW5kc19pbml0KGRldl9wcml2KTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0 OworCiAJcmV0dXJuIDA7CiB9CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK