From: Oscar Mateo Subject: [PATCH v3 16/22] drm/i915/kbl: Move GT and Display workarounds from init_clock_gating Date: Fri, 13 Oct 2017 13:54:10 -0700 Message-ID: <1507928056-6966-17-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 0E1356EBCC for ; Fri, 13 Oct 2017 20:54:14 +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 LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgICAgIHwgMjEg Ky0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJv dW5kcy5jIHwgMTEgKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygr KSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZWRiYWRiOS4u NmI2MjFlNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC04NDI1LDIzICs4NDI1LDYgQEAg c3RhdGljIHZvaWQgZ2VuOF9zZXRfbDNzcWNfY3JlZGl0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJSTkxNV9XUklURShHRU43X01JU0NDUENUTCwgbWlzY2NwY3RsKTsKIH0K IAotc3RhdGljIHZvaWQga2JsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKLXsKLQkvKiBXYURpc2FibGVTREVVbml0Q2xvY2tHYXRpbmc6a2JsICov Ci0JaWYgKElTX0tCTF9SRVZJRChkZXZfcHJpdiwgMCwgS0JMX1JFVklEX0IwKSkKLQkJSTkxNV9X UklURShHRU44X1VDR0NUTDYsIEk5MTVfUkVBRChHRU44X1VDR0NUTDYpIHwKLQkJCSAgIEdFTjhf U0RFVU5JVF9DTE9DS19HQVRFX0RJU0FCTEUpOwotCi0JLyogV2FEaXNhYmxlR2FtQ2xvY2tHYXRp bmc6a2JsICovCi0JaWYgKElTX0tCTF9SRVZJRChkZXZfcHJpdiwgMCwgS0JMX1JFVklEX0IwKSkK LQkJSTkxNV9XUklURShHRU42X1VDR0NUTDEsIEk5MTVfUkVBRChHRU42X1VDR0NUTDEpIHwKLQkJ CSAgIEdFTjZfR0FNVU5JVF9DTE9DS19HQVRFX0RJU0FCTEUpOwotCi0JLyogV2FGYmNOdWtlT25I b3N0TW9kaWZ5OmtibCAqLwotCUk5MTVfV1JJVEUoSUxLX0RQRkNfQ0hJQ0tFTiwgSTkxNV9SRUFE KElMS19EUEZDX0NISUNLRU4pIHwKLQkJICAgSUxLX0RQRkNfTlVLRV9PTl9BTllfTU9ESUZJQ0FU SU9OKTsKLX0KLQogc3RhdGljIHZvaWQgc2tsX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAkvKiBXQUM2ZW50cnlsYXRlbmN5OnNrbCAqLwpA QCAtODkwMiwxMiArODg4NSwxMCBAQCBzdGF0aWMgdm9pZCBub3BfaW5pdF9jbG9ja19nYXRpbmco c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogdm9pZCBpbnRlbF9pbml0X2Nsb2Nr X2dhdGluZ19ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaWYg KElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpIHx8Ci0J ICAgIElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCSAgICBJU19HRU1JTklMQUtFKGRldl9wcml2 KSB8fCBJU19LQUJZTEFLRShkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xv Y2tfZ2F0aW5nID0gbm9wX2luaXRfY2xvY2tfZ2F0aW5nOwogCWVsc2UgaWYgKElTX1NLWUxBS0Uo ZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IHNrbF9p bml0X2Nsb2NrX2dhdGluZzsKLQllbHNlIGlmIChJU19LQUJZTEFLRShkZXZfcHJpdikpCi0JCWRl dl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nID0ga2JsX2luaXRfY2xvY2tfZ2F0aW5n OwogCWVsc2UgaWYgKElTX0JST1hUT04oZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5p bml0X2Nsb2NrX2dhdGluZyA9IGJ4dF9pbml0X2Nsb2NrX2dhdGluZzsKIAllbHNlIGlmIChJU19C Uk9BRFdFTEwoZGV2X3ByaXYpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfd29ya2Fyb3VuZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRz LmMKaW5kZXggYjMwOWRmMy4uZDJhOTY4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfd29ya2Fyb3VuZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93 b3JrYXJvdW5kcy5jCkBAIC04ODksNiArODg5LDE3IEBAIHN0YXRpYyBpbnQga2JsX2Rpc3BsYXlf d29ya2Fyb3VuZHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYg KHJldCkKIAkJcmV0dXJuIHJldDsKIAorCS8qIFdhRGlzYWJsZVNERVVuaXRDbG9ja0dhdGluZzpr YmwgKi8KKwlpZiAoSVNfS0JMX1JFVklEKGRldl9wcml2LCAwLCBLQkxfUkVWSURfQjApKQorCQlE SVNQTEFZX1dBX1NFVF9CSVQoR0VOOF9VQ0dDVEw2LCBHRU44X1NERVVOSVRfQ0xPQ0tfR0FURV9E SVNBQkxFKTsKKworCS8qIFdhRGlzYWJsZUdhbUNsb2NrR2F0aW5nOmtibCAqLworCWlmIChJU19L QkxfUkVWSUQoZGV2X3ByaXYsIDAsIEtCTF9SRVZJRF9CMCkpCisJCURJU1BMQVlfV0FfU0VUX0JJ VChHRU42X1VDR0NUTDEsIEdFTjZfR0FNVU5JVF9DTE9DS19HQVRFX0RJU0FCTEUpOworCisJLyog V2FGYmNOdWtlT25Ib3N0TW9kaWZ5OmtibCAqLworCURJU1BMQVlfV0FfU0VUX0JJVChJTEtfRFBG Q19DSElDS0VOLCBJTEtfRFBGQ19OVUtFX09OX0FOWV9NT0RJRklDQVRJT04pOworCiAJcmV0dXJu IDA7CiB9CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK