From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 2/2] drm/i915/bxt: Sanitize CDCLK to fix breakage during S4 resume Date: Tue, 24 May 2016 15:38:33 +0300 Message-ID: <1464093513-16258-2-git-send-email-imre.deak@intel.com> References: <1464093513-16258-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 81BC06E0D0 for ; Tue, 24 May 2016 12:38:36 +0000 (UTC) In-Reply-To: <1464093513-16258-1-git-send-email-imre.deak@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 List-Id: intel-gfx@lists.freedesktop.org SSBub3RpY2VkIHRoYXQgZHVyaW5nIFM0IHJlc3VtZSBCSU9TIGluY29ycmVjdGx5IHNldHMgYml0 cyAxOCwgMTkgd2hpY2gKYXJlIHJlc2VydmVkL01CWiBhbmQgc2V0cyB0aGUgZGVjaW1hbCBmcmVx dWVuY3kgZmllbGRzIHRvIGFsbCAweGZmIGluCnRoZSBDRENMSyByZWdpc3Rlci4gVGhlIHJlc3Vs dCBpcyBhIGhhcmQgbG9ja3VwIGFzIGRpc3BsYXkgcmVnaXN0ZXIKYWNjZXNzZXMgYXJlIGF0dGVt cHRlZCBsYXRlci4gV29yayBhcm91bmQgdGhpcyBieSBzYW5pdGl6aW5nIHRoZSBDRENMSwpQTEwv ZGl2aWRlcnMgdGhlIHNhbWUgd2F5IGl0J3MgZG9uZSBvbiBTS0wuCgpXaGlsZSB0aGlzIGlzIGNs ZWFybHkgYSBCSU9TIGJ1ZyB3aGljaCBzaG91bGQgYmUgZml4ZWQgc2VwYXJhdGVseSwgaXQKZG9l c24ndCBodXJ0IHRvIGNoZWNrL3Nhbml0aXplIHRoaXMgcmVnYXJkbGVzcy4KCnYyOgotIFVzZSB0 aGUgc2FtZSBjb25kaXRpb24gZm9yIFZDTyBhbmQgQ0RDTEsgaW4gYnJveHRvbl9pbml0X2NkY2xr IGFzIGlzCiAgdXNlZCBpbiBza2xfaW5pdF9jZGNsayBmb3IgdGhlIHNhbWUgcHVycG9zZS4KCkND OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTEgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNDdiMjQ2Ni4uMTlmOTQ3 ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTQxMiwxMSArNTQxMiw1 OCBAQCBzdGF0aWMgdm9pZCBicm94dG9uX3NldF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIGludCBjZGNsaykKIAlpbnRlbF91cGRhdGVfY2RjbGsoZGV2X3ByaXYtPmRl dik7CiB9CiAKK3N0YXRpYyB2b2lkIGJ4dF9zYW5pdGl6ZV9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJdTMyIGNkY3RsLCBleHBlY3RlZDsKKworCWludGVsX3Vw ZGF0ZV9jZGNsayhkZXZfcHJpdi0+ZGV2KTsKKworCWlmIChkZXZfcHJpdi0+Y2RjbGtfcGxsLnZj byA9PSAwIHx8CisJICAgIGRldl9wcml2LT5jZGNsa19mcmVxID09IGRldl9wcml2LT5jZGNsa19w bGwucmVmKQorCQlnb3RvIHNhbml0aXplOworCisJLyogRFBMTCBva2F5OyB2ZXJpZnkgdGhlIGNk Y2xvY2sKKwkgKgorCSAqIFNvbWUgQklPUyB2ZXJzaW9ucyBsZWF2ZSBhbiBpbmNvcnJlY3QgZGVj aW1hbCBmcmVxdWVuY3kgdmFsdWUgYW5kCisJICogc2V0IHJlc2VydmVkIE1CWiBiaXRzIGluIENE Q0xLX0NUTCBhdCBsZWFzdCBkdXJpbmcgZXhpdGluZyBmcm9tIFM0LAorCSAqIHNvIHNhbml0aXpl IHRoaXMgcmVnaXN0ZXIuCisJICovCisJY2RjdGwgPSBJOTE1X1JFQUQoQ0RDTEtfQ1RMKTsKKwkv KgorCSAqIExldCdzIGlnbm9yZSB0aGUgcGlwZSBmaWVsZCwgc2luY2UgQklPUyBjb3VsZCBoYXZl IGNvbmZpZ3VyZWQgdGhlCisJICogZGl2aWRlcnMgYm90aCBzeW5jaGluZyB0byBhbiBhY3RpdmUg cGlwZSwgb3IgYXN5bmNocm9ub3VzbHkKKwkgKiAoUElQRV9OT05FKS4KKwkgKi8KKwljZGN0bCAm PSB+QlhUX0NEQ0xLX0NEMlhfUElQRV9OT05FOworCisJZXhwZWN0ZWQgPSAoY2RjdGwgJiBCWFRf Q0RDTEtfQ0QyWF9ESVZfU0VMX01BU0spIHwKKwkJICAgc2tsX2NkY2xrX2RlY2ltYWwoZGV2X3By aXYtPmNkY2xrX2ZyZXEpOworCS8qCisJICogRGlzYWJsZSBTU0EgUHJlY2hhcmdlIHdoZW4gQ0Qg Y2xvY2sgZnJlcXVlbmN5IDwgNTAwIE1IeiwKKwkgKiBlbmFibGUgb3RoZXJ3aXNlLgorCSAqLwor CWlmIChkZXZfcHJpdi0+Y2RjbGtfZnJlcSA+PSA1MDAwMDApCisJCWV4cGVjdGVkIHw9IEJYVF9D RENMS19TU0FfUFJFQ0hBUkdFX0VOQUJMRTsKKworCWlmIChjZGN0bCA9PSBleHBlY3RlZCkKKwkJ LyogQWxsIHdlbGw7IG5vdGhpbmcgdG8gc2FuaXRpemUgKi8KKwkJcmV0dXJuOworCitzYW5pdGl6 ZToKKwlEUk1fREVCVUdfS01TKCJTYW5pdGl6aW5nIGNkY2xrIHByb2dyYW1tZWQgYnkgcHJlLW9z XG4iKTsKKworCS8qIGZvcmNlIGNkY2xrIHByb2dyYW1taW5nICovCisJZGV2X3ByaXYtPmNkY2xr X2ZyZXEgPSAwOworCisJLyogZm9yY2UgZnVsbCBQTEwgZGlzYWJsZSArIGVuYWJsZSAqLworCWRl dl9wcml2LT5jZGNsa19wbGwudmNvID0gLTE7Cit9CisKIHZvaWQgYnJveHRvbl9pbml0X2NkY2xr KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlpbnRlbF91cGRhdGVfY2Rj bGsoZGV2X3ByaXYtPmRldik7CisJYnh0X3Nhbml0aXplX2NkY2xrKGRldl9wcml2KTsKIAotCWlm IChkZXZfcHJpdi0+Y2RjbGtfcGxsLnZjbyAhPSAwKQorCWlmIChkZXZfcHJpdi0+Y2RjbGtfZnJl cSAhPSAwICYmIGRldl9wcml2LT5jZGNsa19wbGwudmNvICE9IDApCiAJCXJldHVybjsKIAogCS8q Ci0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==