From: Oscar Mateo Subject: [PATCH v3 15/22] drm/i915/glk: Move GT and Display workarounds from init_clock_gating Date: Fri, 13 Oct 2017 13:54:09 -0700 Message-ID: <1507928056-6966-16-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 606AE6EBC8 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 LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgICAgIHwgMzMg KystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3dvcmthcm91bmRzLmMgfCAxNyArKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQs IDE5IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CmluZGV4IGYxZjIwMjMuLmVkYmFkYjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNzgs MzQgKzc4LDYgQEAgc3RhdGljIHZvaWQgYnh0X2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJICAgUFdNMV9HQVRJTkdfRElTIHwgUFdNMl9HQVRJ TkdfRElTKTsKIH0KIAotc3RhdGljIHZvaWQgZ2xrX2luaXRfY2xvY2tfZ2F0aW5nKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKLXsKLQl1MzIgdmFsOwotCi0JLyoKLQkgKiBXYURp c2FibGVQV01DbG9ja0dhdGluZzpnbGsKLQkgKiBCYWNrbGlnaHQgUFdNIG1heSBzdG9wIGluIHRo ZSBhc3NlcnRlZCBzdGF0ZSwgY2F1c2luZyBiYWNrbGlnaHQKLQkgKiB0byBzdGF5IGZ1bGx5IG9u LgotCSAqLwotCUk5MTVfV1JJVEUoR0VOOV9DTEtHQVRFX0RJU18wLCBJOTE1X1JFQUQoR0VOOV9D TEtHQVRFX0RJU18wKSB8Ci0JCSAgIFBXTTFfR0FUSU5HX0RJUyB8IFBXTTJfR0FUSU5HX0RJUyk7 Ci0KLQkvKiBXYURESUlPVGltZW91dDpnbGsgKi8KLQlpZiAoSVNfR0xLX1JFVklEKGRldl9wcml2 LCAwLCBHTEtfUkVWSURfQTEpKSB7Ci0JCXUzMiB2YWwgPSBJOTE1X1JFQUQoQ0hJQ0tFTl9NSVND XzIpOwotCQl2YWwgJj0gfihHTEtfQ0wwX1BXUl9ET1dOIHwKLQkJCSBHTEtfQ0wxX1BXUl9ET1dO IHwKLQkJCSBHTEtfQ0wyX1BXUl9ET1dOKTsKLQkJSTkxNV9XUklURShDSElDS0VOX01JU0NfMiwg dmFsKTsKLQl9Ci0KLQkvKiBEaXNwbGF5IFdBICMxMTMzOiBXYUZiY1NraXBTZWdtZW50czpnbGsg Ki8KLQl2YWwgPSBJOTE1X1JFQUQoSUxLX0RQRkNfQ0hJQ0tFTik7Ci0JdmFsICY9IH5HTEtfU0tJ UF9TRUdfQ09VTlRfTUFTSzsKLQl2YWwgfD0gR0xLX1NLSVBfU0VHX0VOIHwgR0xLX1NLSVBfU0VH X0NPVU5UKDEpOwotCUk5MTVfV1JJVEUoSUxLX0RQRkNfQ0hJQ0tFTiwgdmFsKTsKLX0KLQogc3Rh dGljIHZvaWQgaTkxNV9waW5ldmlld19nZXRfbWVtX2ZyZXEoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogewogCXUzMiB0bXA7CkBAIC04OTI5LDcgKzg5MDEsOCBAQCBzdGF0aWMg dm9pZCBub3BfaW5pdF9jbG9ja19nYXRpbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogICovCiB2b2lkIGludGVsX2luaXRfY2xvY2tfZ2F0aW5nX2hvb2tzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlpZiAoSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikg fHwgSVNfQ09GRkVFTEFLRShkZXZfcHJpdikpCisJaWYgKElTX0NBTk5PTkxBS0UoZGV2X3ByaXYp IHx8IElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpIHx8CisJICAgIElTX0dFTUlOSUxBS0UoZGV2X3By aXYpKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IG5vcF9pbml0X2Ns b2NrX2dhdGluZzsKIAllbHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSkKIAkJZGV2X3ByaXYt PmRpc3BsYXkuaW5pdF9jbG9ja19nYXRpbmcgPSBza2xfaW5pdF9jbG9ja19nYXRpbmc7CkBAIC04 OTM3LDggKzg5MTAsNiBAQCB2b2lkIGludGVsX2luaXRfY2xvY2tfZ2F0aW5nX2hvb2tzKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdF9j bG9ja19nYXRpbmcgPSBrYmxfaW5pdF9jbG9ja19nYXRpbmc7CiAJZWxzZSBpZiAoSVNfQlJPWFRP TihkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmluaXRfY2xvY2tfZ2F0aW5nID0gYnh0 X2luaXRfY2xvY2tfZ2F0aW5nOwotCWVsc2UgaWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQot CQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGdsa19pbml0X2Nsb2NrX2dh dGluZzsKIAllbHNlIGlmIChJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ZGlz cGxheS5pbml0X2Nsb2NrX2dhdGluZyA9IGJkd19pbml0X2Nsb2NrX2dhdGluZzsKIAllbHNlIGlm IChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3Jr YXJvdW5kcy5jCmluZGV4IDYzMDg2ZWYuLmIzMDlkZjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfd29ya2Fyb3VuZHMuYwpAQCAtODk4LDYgKzg5OCwyMyBAQCBzdGF0aWMgaW50IGdsa19k aXNwbGF5X3dvcmthcm91bmRzX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKKwkvKgorCSAqIFdhRGlzYWJsZVBXTUNsb2Nr R2F0aW5nOmdsaworCSAqIEJhY2tsaWdodCBQV00gbWF5IHN0b3AgaW4gdGhlIGFzc2VydGVkIHN0 YXRlLCBjYXVzaW5nIGJhY2tsaWdodAorCSAqIHRvIHN0YXkgZnVsbHkgb24uCisJICovCisJRElT UExBWV9XQV9TRVRfQklUKEdFTjlfQ0xLR0FURV9ESVNfMCwgUFdNMV9HQVRJTkdfRElTIHwgUFdN Ml9HQVRJTkdfRElTKTsKKworCS8qIFdhRERJSU9UaW1lb3V0OmdsayAqLworCWlmIChJU19HTEtf UkVWSUQoZGV2X3ByaXYsIDAsIEdMS19SRVZJRF9BMSkpCisJCURJU1BMQVlfV0FfQ0xSX0JJVChD SElDS0VOX01JU0NfMiwgR0xLX0NMMF9QV1JfRE9XTiB8CisJCQkJCQkgICBHTEtfQ0wxX1BXUl9E T1dOIHwKKwkJCQkJCSAgIEdMS19DTDJfUFdSX0RPV04pOworCisJLyogRGlzcGxheSBXQSAjMTEz MzogV2FGYmNTa2lwU2VnbWVudHM6Z2xrICovCisJRElTUExBWV9XQV9TRVRfRklFTEQoSUxLX0RQ RkNfQ0hJQ0tFTiwgR0xLX1NLSVBfU0VHX0NPVU5UX01BU0ssCisJCQkgICAgIEdMS19TS0lQX1NF R19FTiB8IEdMS19TS0lQX1NFR19DT1VOVCgxKSk7CisKIAlyZXR1cm4gMDsKIH0KIAotLSAKMS45 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=