From mboxrd@z Thu Jan  1 00:00:00 1970
From: Imre Deak <imre.deak@intel.com>
Subject: [PATCH 2/2] drm/i915/bxt: Sanitize CDCLK to fix
	breakage during S4 resume
Date: Tue, 24 May 2016 12:27:51 +0300
Message-ID: <1464082071-4562-2-git-send-email-imre.deak@intel.com>
References: <1464082071-4562-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTP id B465D6E6CE
 for <intel-gfx@lists.freedesktop.org>; Tue, 24 May 2016 09:27:53 +0000 (UTC)
In-Reply-To: <1464082071-4562-1-git-send-email-imre.deak@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

SSBub3RpY2VkIHRoYXQgZHVyaW5nIFM0IHJlc3VtZSBCSU9TIGluY29ycmVjdGx5IHNldHMgYml0
cyAxOCwgMTkgd2hpY2gKYXJlIHJlc2VydmVkL01CWiBhbmQgc2V0cyB0aGUgZGVjaW1hbCBmcmVx
dWVuY3kgZmllbGRzIHRvIGFsbCAweGZmIGluCnRoZSBDRENMSyByZWdpc3Rlci4gVGhlIHJlc3Vs
dCBpcyBhIGhhcmQgbG9ja3VwIGFzIGRpc3BsYXkgcmVnaXN0ZXIKYWNjZXNzZXMgYXJlIGF0dGVt
cHRlZCBsYXRlci4gV29yayBhcm91bmQgdGhpcyBieSBzYW5pdGl6aW5nIHRoZSBDRENMSwpQTEwv
ZGl2aWRlcnMgdGhlIHNhbWUgd2F5IGl0J3MgZG9uZSBvbiBTS0wuCgpXaGlsZSB0aGlzIGlzIGNs
ZWFybHkgYSBCSU9TIGJ1ZyB3aGljaCBzaG91bGQgYmUgZml4ZWQgc2VwYXJhdGVseSwgaXQKZG9l
c24ndCBodXJ0IHRvIGNoZWNrL3Nhbml0aXplIHRoaXMgcmVnYXJkbGVzcy4KClNpZ25lZC1vZmYt
Ynk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA1MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr
KysrLS0KIDEgZmlsZSBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoK
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBiOGU1OTk1Li40NzlkMmU0IDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC01NDEyLDExICs1NDEyLDU4IEBA
IHN0YXRpYyB2b2lkIGJyb3h0b25fc2V0X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdiwgaW50IGNkY2xrKQogCWludGVsX3VwZGF0ZV9jZGNsayhkZXZfcHJpdi0+ZGV2KTsK
IH0KIAorc3RhdGljIHZvaWQgYnh0X3Nhbml0aXplX2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2
YXRlICpkZXZfcHJpdikKK3sKKwl1MzIgY2RjdGwsIGV4cGVjdGVkOworCisJaW50ZWxfdXBkYXRl
X2NkY2xrKGRldl9wcml2LT5kZXYpOworCisJaWYgKCFkZXZfcHJpdi0+Y2RjbGtfcGxsLnZjbyB8
fAorCSAgICBkZXZfcHJpdi0+Y2RjbGtfZnJlcSA9PSBkZXZfcHJpdi0+Y2RjbGtfcGxsLnJlZikK
KwkJZ290byBzYW5pdGl6ZTsKKworCS8qIERQTEwgb2theTsgdmVyaWZ5IHRoZSBjZGNsb2NrCisJ
ICoKKwkgKiBTb21lIEJJT1MgdmVyc2lvbnMgbGVhdmUgYW4gaW5jb3JyZWN0IGRlY2ltYWwgZnJl
cXVlbmN5IHZhbHVlIGFuZAorCSAqIHNldCByZXNlcnZlZCBNQlogYml0cyBpbiBDRENMS19DVEwg
YXQgbGVhc3QgZHVyaW5nIGV4aXRpbmcgZnJvbSBTNCwKKwkgKiBzbyBzYW5pdGl6ZSB0aGlzIHJl
Z2lzdGVyLgorCSAqLworCWNkY3RsID0gSTkxNV9SRUFEKENEQ0xLX0NUTCk7CisJLyoKKwkgKiBM
ZXQncyBpZ25vcmUgdGhlIHBpcGUgZmllbGQsIHNpbmNlIEJJT1MgY291bGQgaGF2ZSBjb25maWd1
cmVkIHRoZQorCSAqIGRpdmlkZXJzIGJvdGggc3luY2hpbmcgdG8gYW4gYWN0aXZlIHBpcGUsIG9y
IGFzeW5jaHJvbm91c2x5CisJICogKFBJUEVfTk9ORSkuCisJICovCisJY2RjdGwgJj0gfkJYVF9D
RENMS19DRDJYX1BJUEVfTk9ORTsKKworCWV4cGVjdGVkID0gKGNkY3RsICYgQlhUX0NEQ0xLX0NE
MlhfRElWX1NFTF9NQVNLKSB8CisJCSAgIHNrbF9jZGNsa19kZWNpbWFsKGRldl9wcml2LT5jZGNs
a19mcmVxKTsKKwkvKgorCSAqIERpc2FibGUgU1NBIFByZWNoYXJnZSB3aGVuIENEIGNsb2NrIGZy
ZXF1ZW5jeSA8IDUwMCBNSHosCisJICogZW5hYmxlIG90aGVyd2lzZS4KKwkgKi8KKwlpZiAoZGV2
X3ByaXYtPmNkY2xrX2ZyZXEgPj0gNTAwMDAwKQorCQlleHBlY3RlZCB8PSBCWFRfQ0RDTEtfU1NB
X1BSRUNIQVJHRV9FTkFCTEU7CisKKwlpZiAoY2RjdGwgPT0gZXhwZWN0ZWQpCisJCS8qIEFsbCB3
ZWxsOyBub3RoaW5nIHRvIHNhbml0aXplICovCisJCXJldHVybjsKKworc2FuaXRpemU6CisJRFJN
X0RFQlVHX0tNUygiU2FuaXRpemluZyBjZGNsayBwcm9ncmFtbWVkIGJ5IHByZS1vc1xuIik7CisK
KwkvKiBmb3JjZSBjZGNsayBwcm9ncmFtbWluZyAqLworCWRldl9wcml2LT5jZGNsa19mcmVxID0g
MDsKKworCS8qIGZvcmNlIGZ1bGwgUExMIGRpc2FibGUgKyBlbmFibGUgKi8KKwlkZXZfcHJpdi0+
Y2RjbGtfcGxsLnZjbyA9IC0xOworfQorCiB2b2lkIGJyb3h0b25faW5pdF9jZGNsayhzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaW50ZWxfdXBkYXRlX2NkY2xrKGRldl9w
cml2LT5kZXYpOworCWJ4dF9zYW5pdGl6ZV9jZGNsayhkZXZfcHJpdik7CiAKLQlpZiAoZGV2X3By
aXYtPmNkY2xrX3BsbC52Y28gIT0gMCkKKwlpZiAoZGV2X3ByaXYtPmNkY2xrX2ZyZXEgPiAwICYm
IGRldl9wcml2LT5jZGNsa19wbGwudmNvID4gMCkKIAkJcmV0dXJuOwogCiAJLyoKLS0gCjIuNS4w
CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n
ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK