From: Oscar Mateo Subject: [PATCH v3 20/22] drm/i915/bdw: Move GT and Display workarounds from init_clock_gating Date: Fri, 13 Oct 2017 13:54:14 -0700 Message-ID: <1507928056-6966-21-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 202936E0CD 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: Paulo Zanoni , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org VG8gdGhlaXIgcmlnaHRmdWwgcGxhY2UgaW5zaWRlIGludGVsX3dvcmthcm91bmRzLmMKClRPRE86 IE5vdGljZSB0aGF0IHdlIGFyZSBsZWF2aW5nIFdhUHJvZ3JhbUwzU3FjUmVnMURlZmF1bHQgKGFu ZCB0aGUKYXNzb2NpYXRlZCBXYVRlbXBEaXNhYmxlRE9QQ2xrR2F0aW5nKSBiZWhpbmQgYmVjYXVz ZSBpdCByZXF1aXJlcwpleHRyYSBjYXJlZnVsIHJldmlld2luZy4gV2UnbGwgZGVhbCB3aXRoIGl0 IGluIGEgc2VwYXJhdGUgcGF0Y2guCgpUT0RPMjogRGVjaWRlIHdoYXQgdG8gZG8gd2l0aCBscHRf aW5pdF9jbG9ja19nYXRpbmcgKHNob3VsZG4ndApXQURQT0Nsb2NrR2F0aW5nRGlzYWJsZSBiZSBt YXJrZWQgYXMgImJkdyI/IHNob3VsZG4ndCBpdCBiZQpwcm90ZWN0ZWQgYnkgSEFTX1BDSF9MUFRf TFA/IGRvIHdlIHdhbnQgdG8gbW92ZSB0aGUgd2hvbGUgdGhpbmcKdG8gdGhlIHdvcmthcm91bmRz IGZpbGUgb3Igbm90PykuCgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0ZW9A aW50ZWwuY29tPgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzog Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWthIEt1b3BwYWxh IDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmls bGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFu b25pQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAg ICAgIHwgNDcgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMgfCA0MyArKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogMiBmaWxlcyBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCA0NyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA0MzhhMTI5Li4yOTZmZTgzIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKQEAgLTg0MDYsNTkgKzg0MDYsMTIgQEAgc3RhdGljIHZvaWQgZ2VuOF9z ZXRfbDNzcWNfY3JlZGl0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIHN0 YXRpYyB2b2lkIGJkd19pbml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7Ci0JLyogVGhlIEdUVCBjYWNoZSBtdXN0IGJlIGRpc2FibGVkIGlmIHRoZSBz eXN0ZW0gaXMgdXNpbmcgMk0gcGFnZXMuICovCi0JYm9vbCBjYW5fdXNlX2d0dF9jYWNoZSA9ICFI QVNfUEFHRV9TSVpFUyhkZXZfcHJpdiwKLQkJCQkJCSBJOTE1X0dUVF9QQUdFX1NJWkVfMk0pOwot CWVudW0gcGlwZSBwaXBlOwotCiAJaWxrX2luaXRfbHBfd2F0ZXJtYXJrcyhkZXZfcHJpdik7CiAK LQkvKiBXYVN3aXRjaFNvbFZmRkFyYml0cmF0aW9uUHJpb3JpdHk6YmR3ICovCi0JSTkxNV9XUklU RShHQU1fRUNPQ0hLLCBJOTE1X1JFQUQoR0FNX0VDT0NISykgfCBIU1dfRUNPQ0hLX0FSQl9QUklP X1NPTCk7Ci0KLQkvKiBXYVBzckRQQU1hc2tWQmxhbmtJblNSRDpiZHcgKi8KLQlJOTE1X1dSSVRF KENISUNLRU5fUEFSMV8xLAotCQkgICBJOTE1X1JFQUQoQ0hJQ0tFTl9QQVIxXzEpIHwgRFBBX01B U0tfVkJMQU5LX1NSRCk7Ci0KLQkvKiBXYVBzckRQUlNVbm1hc2tWQmxhbmtJblNSRDpiZHcgKi8K LQlmb3JfZWFjaF9waXBlKGRldl9wcml2LCBwaXBlKSB7Ci0JCUk5MTVfV1JJVEUoQ0hJQ0tFTl9Q SVBFU0xfMShwaXBlKSwKLQkJCSAgIEk5MTVfUkVBRChDSElDS0VOX1BJUEVTTF8xKHBpcGUpKSB8 Ci0JCQkgICBCRFdfRFBSU19NQVNLX1ZCTEFOS19TUkQpOwotCX0KLQotCS8qIFdhVlNSZWZDb3Vu dEZ1bGxmb3JjZU1pc3NEaXNhYmxlOmJkdyAqLwotCS8qIFdhRFNSZWZDb3VudEZ1bGxmb3JjZU1p c3NEaXNhYmxlOmJkdyAqLwotCUk5MTVfV1JJVEUoR0VON19GRl9USFJFQURfTU9ERSwKLQkJICAg STkxNV9SRUFEKEdFTjdfRkZfVEhSRUFEX01PREUpICYKLQkJICAgfihHRU44X0ZGX0RTX1JFRl9D TlRfRkZNRSB8IEdFTjdfRkZfVlNfUkVGX0NOVF9GRk1FKSk7Ci0KLQlJOTE1X1dSSVRFKEdFTjZf UkNfU0xFRVBfUFNNSV9DT05UUk9MLAotCQkgICBfTUFTS0VEX0JJVF9FTkFCTEUoR0VOOF9SQ19T RU1BX0lETEVfTVNHX0RJU0FCTEUpKTsKLQotCS8qIFdhRGlzYWJsZVNERVVuaXRDbG9ja0dhdGlu ZzpiZHcgKi8KLQlJOTE1X1dSSVRFKEdFTjhfVUNHQ1RMNiwgSTkxNV9SRUFEKEdFTjhfVUNHQ1RM NikgfAotCQkgICBHRU44X1NERVVOSVRfQ0xPQ0tfR0FURV9ESVNBQkxFKTsKLQogCS8qIFdhUHJv Z3JhbUwzU3FjUmVnMURlZmF1bHQ6YmR3ICovCiAJZ2VuOF9zZXRfbDNzcWNfY3JlZGl0cyhkZXZf cHJpdiwgMzAsIDIpOwogCi0JLyogV2FHdHRDYWNoaW5nT2ZmQnlEZWZhdWx0OmJkdyAqLwotCUk5 MTVfV1JJVEUoSFNXX0dUVF9DQUNIRV9FTiwgY2FuX3VzZV9ndHRfY2FjaGUgPyBHVFRfQ0FDSEVf RU5fQUxMIDogMCk7Ci0KLQkvKiBXYUtWTU5vdGlmaWNhdGlvbk9uQ29uZmlnQ2hhbmdlOmJkdyAq LwotCUk5MTVfV1JJVEUoQ0hJQ0tFTl9QQVIyXzEsIEk5MTVfUkVBRChDSElDS0VOX1BBUjJfMSkK LQkJICAgfCBLVk1fQ09ORklHX0NIQU5HRV9OT1RJRklDQVRJT05fU0VMRUNUKTsKLQogCWxwdF9p bml0X2Nsb2NrX2dhdGluZyhkZXZfcHJpdik7Ci0KLQkvKiBXYURpc2FibGVEb3BDbG9ja0dhdGlu ZzpiZHcKLQkgKgotCSAqIEFsc28gc2VlIHRoZSBDSElDS0VOMiB3cml0ZSBpbiBiZHdfaW5pdF93 b3JrYXJvdW5kcygpIHRvIGRpc2FibGUgRE9QCi0JICogY2xvY2sgZ2F0aW5nLgotCSAqLwotCUk5 MTVfV1JJVEUoR0VONl9VQ0dDVEwxLAotCQkgICBJOTE1X1JFQUQoR0VONl9VQ0dDVEwxKSB8IEdF TjZfRVVfVENVTklUX0NMT0NLX0dBVEVfRElTQUJMRSk7CiB9CiAKIHN0YXRpYyB2b2lkIGhzd19p bml0X2Nsb2NrX2dhdGluZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwppbmRleCAyNmU3ZTA3Li5jYTlkOTA2 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKQEAgLTU2Myw2ICs1 NjMsMjUgQEAgc3RhdGljIGludCBndF93YV9hZGQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCiBzdGF0aWMgaW50IGJkd19ndF93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKKwkvKiBUaGUgR1RUIGNhY2hlIG11c3QgYmUgZGlz YWJsZWQgaWYgdGhlIHN5c3RlbSBpcyB1c2luZyAyTSBwYWdlcy4gKi8KKwlib29sIGNhbl91c2Vf Z3R0X2NhY2hlID0gIUhBU19QQUdFX1NJWkVTKGRldl9wcml2LCBJOTE1X0dUVF9QQUdFX1NJWkVf Mk0pOworCisJLyogV2FTd2l0Y2hTb2xWZkZBcmJpdHJhdGlvblByaW9yaXR5OmJkdyAqLworCUdU X1dBX1NFVF9CSVQoR0FNX0VDT0NISywgSFNXX0VDT0NIS19BUkJfUFJJT19TT0wpOworCisJLyog V2FWU1JlZkNvdW50RnVsbGZvcmNlTWlzc0Rpc2FibGU6YmR3ICovCisJLyogV2FEU1JlZkNvdW50 RnVsbGZvcmNlTWlzc0Rpc2FibGU6YmR3ICovCisJR1RfV0FfQ0xSX0JJVChHRU43X0ZGX1RIUkVB RF9NT0RFLCBHRU44X0ZGX0RTX1JFRl9DTlRfRkZNRSB8CisJCQkJCSAgIEdFTjdfRkZfVlNfUkVG X0NOVF9GRk1FKTsKKworCS8qIFdhRGlzYWJsZVNlbWFwaG9yZUFuZFN5bmNGbGlwV2FpdDpiZHcg Ki8KKwlHVF9XQV9TRVRfQklUX01BU0tFRChHRU42X1JDX1NMRUVQX1BTTUlfQ09OVFJPTCwKKwkJ CSAgICAgR0VOOF9SQ19TRU1BX0lETEVfTVNHX0RJU0FCTEUpOworCisJLyogV2FHdHRDYWNoaW5n T2ZmQnlEZWZhdWx0OmJkdyAqLworCUdUX1dBX1NFVF9GSUVMRChIU1dfR1RUX0NBQ0hFX0VOLCAw eEZGRkZGRkZGLAorCQkJY2FuX3VzZV9ndHRfY2FjaGUgPyBHVFRfQ0FDSEVfRU5fQUxMIDogMCk7 CisKIAlyZXR1cm4gMDsKIH0KIApAQCAtODQwLDYgKzg1OSwzMCBAQCBzdGF0aWMgaW50IGRpc3Bs YXlfd2FfYWRkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogc3RhdGljIGlu dCBiZHdfZGlzcGxheV93b3JrYXJvdW5kc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIHsKKwllbnVtIHBpcGUgcGlwZTsKKworCS8qIFdhUHNyRFBBTWFza1ZCbGFua0lu U1JEOmJkdyAqLworCURJU1BMQVlfV0FfU0VUX0JJVChDSElDS0VOX1BBUjFfMSwgRFBBX01BU0tf VkJMQU5LX1NSRCk7CisKKwkvKiBXYVBzckRQUlNVbm1hc2tWQmxhbmtJblNSRDpiZHcgKi8KKwlm b3JfZWFjaF9waXBlKGRldl9wcml2LCBwaXBlKSB7CisJCURJU1BMQVlfV0FfU0VUX0JJVChDSElD S0VOX1BJUEVTTF8xKHBpcGUpLAorCQkJCSAgIEJEV19EUFJTX01BU0tfVkJMQU5LX1NSRCk7CisJ fQorCisJLyogV2FEaXNhYmxlU0RFVW5pdENsb2NrR2F0aW5nOmJkdyAqLworCURJU1BMQVlfV0Ff U0VUX0JJVChHRU44X1VDR0NUTDYsIEdFTjhfU0RFVU5JVF9DTE9DS19HQVRFX0RJU0FCTEUpOwor CisJLyogV2FLVk1Ob3RpZmljYXRpb25PbkNvbmZpZ0NoYW5nZTpiZHcgKi8KKwlESVNQTEFZX1dB X1NFVF9CSVQoQ0hJQ0tFTl9QQVIyXzEsIEtWTV9DT05GSUdfQ0hBTkdFX05PVElGSUNBVElPTl9T RUxFQ1QpOworCisJLyogV2FEaXNhYmxlRG9wQ2xvY2tHYXRpbmc6YmR3CisJICoKKwkgKiBBbHNv IHNlZSB0aGUgQ0hJQ0tFTjIgd3JpdGUgaW4gYmR3X2d0X3dvcmthcm91bmRzX2luaXQoKSB0byBk aXNhYmxlCisJICogRE9QIGNsb2NrIGdhdGluZy4KKwkgKi8KKwlESVNQTEFZX1dBX1NFVF9CSVQo R0VONl9VQ0dDVEwxLCBHRU42X0VVX1RDVU5JVF9DTE9DS19HQVRFX0RJU0FCTEUpOworCiAJcmV0 dXJuIDA7CiB9CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK