From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 5/6] drm/i915: Apply the PPS register unlock workaround more consistently Date: Tue, 9 Aug 2016 20:21:34 +0300 Message-ID: <1470763294-7183-4-git-send-email-imre.deak@intel.com> References: <1470763294-7183-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FDE66E60F for ; Tue, 9 Aug 2016 17:21:43 +0000 (UTC) In-Reply-To: <1470763294-7183-1-git-send-email-imre.deak@intel.com> In-Reply-To: <1470742452-5240-6-git-send-email-imre.deak@intel.com> References: <1470742452-5240-6-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 QXRtLCB3ZSBhcHBseSB0aGlzIHdvcmthcm91bmQgc29tZXdoYXQgaW5jb25zaXN0ZW50bHkgYXQg dGhlIGZvbGxvd2luZwpwb2ludHM6IGRyaXZlciBsb2FkaW5nLCBMVkRTIGluaXQsIGVEUCBQUFMg aW5pdCwgc3lzdGVtIHJlc3VtZS4gQXMgdGhpcwp3b3JrYXJvdW5kIGFsc28gYWZmZWN0cyByZWdp c3RlcnMgb3RoZXIgdGhhbiBQUFMgKHRpbWluZywgUExMKSBhIG1vcmUKY29uc2lzdGVudCB3YXkg aXMgdG8gYXBwbHkgaXQgZWFybHkgYWZ0ZXIgdGhlIFBQUyBIVyBjb250ZXh0IGlzIGtub3duIHRv CmJlIGxvc3Q6IGRyaXZlciBsb2FkaW5nLCBzeXN0ZW0gcmVzdW1lIGFuZCBvbiBWTFYvQ0hWL0JY VCB3aGVuIHR1cm5pbmcKb24gcG93ZXIgZG9tYWlucy4KClRoaXMgaXMgbmVlZGVkIGJ5IHRoZSBu ZXh0IHBhdGNoIHRoYXQgcmVtb3ZlcyBzYXZpbmcvcmVzdG9yaW5nIG9mIHRoZQpQUF9DT05UUk9M IHJlZ2lzdGVyLgoKVGhpcyBhbHNvIHJlbW92ZXMgdGhlIGluY29ycmVjdCBwcm9ncmFtbWluZyBv ZiB0aGUgd29ya2Fyb3VuZCBvbiBIU1crClBDSCBwbGF0Zm9ybXMgd2hpY2ggZG9uJ3QgaGF2ZSB0 aGUgcmVnaXN0ZXIgbG9ja2luZyBtZWNoYW5pc20uCgp2MjogKFZpbGxlKQotIERvbid0IGFwcGx5 IHRoZSB3b3JrYXJvdW5kIG9uIEJYVC4KLSBTaW1wbGlmeSBwbGF0Zm9ybSBjaGVja3MgdXNpbmcg SEFTX0RESSgpLgoKU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgICB8ICAxICsKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8IDI2ICsrKysrKysrKysrKysr KysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICAgICAgICAgfCAg MyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgICB8ICAxICsKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYyAgICAgICB8ICA4IC0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgfCAgNCArKysrCiA2IGZpbGVzIGNo YW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKaW5kZXggOGNmYzI2NC4uMGZjZDFjMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBA IC0xNTYwLDYgKzE1NjAsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCWk5MTVfZ2VtX3Jlc3VtZShkZXYpOwogCiAJaTkxNV9yZXN0b3JlX3N0 YXRlKGRldik7CisJaW50ZWxfcHBzX3VubG9ja19yZWdzX3dhKGRldl9wcml2KTsKIAlpbnRlbF9v cHJlZ2lvbl9zZXR1cChkZXZfcHJpdik7CiAKIAlpbnRlbF9pbml0X3BjaF9yZWZjbGsoZGV2KTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAzZDVmZDA2Li5iY2JmMjc3IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xNDYzNSw2ICsxNDYzNSwzMCBA QCBzdGF0aWMgYm9vbCBpbnRlbF9jcnRfcHJlc2VudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CXJldHVybiB0cnVlOwogfQogCit2b2lkIGludGVsX3Bwc191bmxvY2tfcmVnc193YShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJaW50IHBwc19udW07CisJaW50IHBwc19p ZHg7CisKKwlpZiAoSEFTX0RESShkZXZfcHJpdikpCisJCXJldHVybjsKKwkvKgorCSAqIFRoaXMg dy9hIGlzIG5lZWRlZCBhdCBsZWFzdCBvbiBDUFQvUFBULCBidXQgdG8gYmUgc3VyZSBhcHBseSBp dAorCSAqIGV2ZXJ5d2hlcmUgd2hlcmUgcmVnaXN0ZXJzIGNhbiBiZSB3cml0ZSBwcm90ZWN0ZWQu CisJICovCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKQorCQlwcHNfbnVtID0gMjsKKwllbHNlCisJCXBwc19udW0gPSAxOworCisJZm9yIChw cHNfaWR4ID0gMDsgcHBzX2lkeCA8IHBwc19udW07IHBwc19pZHgrKykgeworCQl1MzIgdmFsID0g STkxNV9SRUFEKFBQX0NPTlRST0wocHBzX2lkeCkpOworCisJCXZhbCA9ICh2YWwgJiB+UEFORUxf VU5MT0NLX01BU0spIHwgUEFORUxfVU5MT0NLX1JFR1M7CisJCUk5MTVfV1JJVEUoUFBfQ09OVFJP TChwcHNfaWR4KSwgdmFsKTsKKwl9Cit9CisKIHN0YXRpYyB2b2lkIGludGVsX3Bwc19pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlpZiAoSEFTX1BDSF9TUExJVChk ZXZfcHJpdikgfHwgSVNfQlJPWFRPTihkZXZfcHJpdikpCkBAIC0xNDY0Myw2ICsxNDY2Nyw4IEBA IHN0YXRpYyB2b2lkIGludGVsX3Bwc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAkJZGV2X3ByaXYtPnBwc19tbWlvX2Jhc2UgPSBWTFZfUFBTX0JBU0U7CiAJZWxzZQog CQlkZXZfcHJpdi0+cHBzX21taW9fYmFzZSA9IFBQU19CQVNFOworCisJaW50ZWxfcHBzX3VubG9j a19yZWdzX3dhKGRldl9wcml2KTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfc2V0dXBfb3V0cHV0 cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMmVm N2IxNC4uM2QzZDNmYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xODI5LDcgKzE4Mjks OCBAQCBzdGF0aWMgIHUzMiBpcm9ubGFrZV9nZXRfcHBfY29udHJvbChzdHJ1Y3QgaW50ZWxfZHAg KmludGVsX2RwKQogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5wcHNfbXV0ZXgpOwog CiAJY29udHJvbCA9IEk5MTVfUkVBRChfcHBfY3RybF9yZWcoaW50ZWxfZHApKTsKLQlpZiAoIUlT X0JST1hUT04oZGV2KSkgeworCWlmIChXQVJOX09OKCFIQVNfRERJKGRldl9wcml2KSAmJgorCQkg ICAgIChjb250cm9sICYgUEFORUxfVU5MT0NLX01BU0spICE9IFBBTkVMX1VOTE9DS19SRUdTKSkg ewogCQljb250cm9sICY9IH5QQU5FTF9VTkxPQ0tfTUFTSzsKIAkJY29udHJvbCB8PSBQQU5FTF9V TkxPQ0tfUkVHUzsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGMyOWE0MjkuLmNi Y2U3ODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMTU5LDYgKzExNTksNyBAQCB2 b2lkIGludGVsX21hcmtfYnVzeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwog dm9pZCBpbnRlbF9tYXJrX2lkbGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsK IHZvaWQgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIGlu dCBpbnRlbF9kaXNwbGF5X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIGlu dGVsX3Bwc191bmxvY2tfcmVnc193YShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Owogdm9pZCBpbnRlbF9lbmNvZGVyX2Rlc3Ryb3koc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVy KTsKIGludCBpbnRlbF9jb25uZWN0b3JfaW5pdChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICopOwog c3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yX2FsbG9jKHZvaWQpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHZkcy5jCmluZGV4IDkzOWY1MWYuLjM1ZDU1ZjEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9sdmRzLmMKQEAgLTk3NywxNCArOTc3LDYgQEAgdm9pZCBpbnRlbF9sdmRzX2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnQgcGlwZTsKIAl1OCBwaW47CiAKLQkvKgot CSAqIFVubG9jayByZWdpc3RlcnMgYW5kIGp1c3QgbGVhdmUgdGhlbSB1bmxvY2tlZC4gRG8gdGhp cyBiZWZvcmUKLQkgKiBjaGVja2luZyBxdWlyayBsaXN0cyB0byBhdm9pZCBib2d1cyBXQVJOSU5H cy4KLQkgKi8KLQlpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikgfHwgSU5URUxfR0VOKGRldl9w cml2KSA8PSA0KQotCQlJOTE1X1dSSVRFKFBQX0NPTlRST0woMCksCi0JCQkgICBJOTE1X1JFQUQo UFBfQ09OVFJPTCgwKSkgfCBQQU5FTF9VTkxPQ0tfUkVHUyk7Ci0KIAlpZiAoIWludGVsX2x2ZHNf c3VwcG9ydGVkKGRldikpCiAJCXJldHVybjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVu dGltZV9wbS5jCmluZGV4IDFjNjAzYmIuLjhmNTFhZTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ydW50aW1lX3BtLmMKQEAgLTU5Miw2ICs1OTIsOCBAQCB2b2lkIGJ4dF9kaXNhYmxlX2Rj OShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJRFJNX0RFQlVHX0tNUygiRGlz YWJsaW5nIERDOVxuIik7CiAKIAlnZW45X3NldF9kY19zdGF0ZShkZXZfcHJpdiwgRENfU1RBVEVf RElTQUJMRSk7CisKKwlpbnRlbF9wcHNfdW5sb2NrX3JlZ3Nfd2EoZGV2X3ByaXYpOwogfQogCiBz dGF0aWMgdm9pZCBhc3NlcnRfY3NyX2xvYWRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCkBAIC0xMTQ1LDYgKzExNDcsOCBAQCBzdGF0aWMgdm9pZCB2bHZfZGlzcGxheV9wb3dl cl93ZWxsX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJdmx2X3Nl dF9wb3dlcl93ZWxsKGRldl9wcml2LCBwb3dlcl93ZWxsLCB0cnVlKTsKIAogCXZsdl9kaXNwbGF5 X3Bvd2VyX3dlbGxfaW5pdChkZXZfcHJpdik7CisKKwlpbnRlbF9wcHNfdW5sb2NrX3JlZ3Nfd2Eo ZGV2X3ByaXYpOwogfQogCiBzdGF0aWMgdm9pZCB2bHZfZGlzcGxheV9wb3dlcl93ZWxsX2Rpc2Fi bGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotLSAKMi41LjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=