From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v3 5/6] drm/i915: Apply the PPS register unlock workaround more consistently Date: Tue, 9 Aug 2016 21:59:17 +0300 Message-ID: <1470769157-13170-2-git-send-email-imre.deak@intel.com> References: <1470769157-13170-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 170986E644 for ; Tue, 9 Aug 2016 18:59:21 +0000 (UTC) In-Reply-To: <1470769157-13170-1-git-send-email-imre.deak@intel.com> In-Reply-To: <1470763294-7183-4-git-send-email-imre.deak@intel.com> References: <1470763294-7183-4-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 SEFTX0RESSgpLgp2MzoKLSBNb3ZlIHRoZSBjYWxsIG9mIGludGVsX3Bwc191bmxvY2tfcmVnc193 YSgpIHRvIHRoZSBtb3JlCiAgbG9naWNhbCB2bHZfZGlzcGxheV9wb3dlcl93ZWxsX2luaXQoKSAo YWxzbyBmaXhpbmcgQ0hWKSAoVmlsbGUpLgoKU2lnbmVkLW9mZi1ieTogSW1yZSBEZWFrIDxpbXJl LmRlYWtAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j ICAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAg fCAyNiArKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHAuYyAgICAgICAgIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMgICAgICAg fCAgOCAtLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwg IDQgKysrKwogNiBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDhjZmMyNjQuLjBmY2QxYzAgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYwpAQCAtMTU2MCw2ICsxNTYwLDcgQEAgc3RhdGljIGludCBpOTE1X2Ry bV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpOTE1X2dlbV9yZXN1bWUoZGV2KTsK IAogCWk5MTVfcmVzdG9yZV9zdGF0ZShkZXYpOworCWludGVsX3Bwc191bmxvY2tfcmVnc193YShk ZXZfcHJpdik7CiAJaW50ZWxfb3ByZWdpb25fc2V0dXAoZGV2X3ByaXYpOwogCiAJaW50ZWxfaW5p dF9wY2hfcmVmY2xrKGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg M2Q1ZmQwNi4uYmNiZjI3NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt MTQ2MzUsNiArMTQ2MzUsMzAgQEAgc3RhdGljIGJvb2wgaW50ZWxfY3J0X3ByZXNlbnQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gdHJ1ZTsKIH0KIAordm9pZCBpbnRlbF9wcHNfdW5s b2NrX3JlZ3Nfd2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWludCBw cHNfbnVtOworCWludCBwcHNfaWR4OworCisJaWYgKEhBU19EREkoZGV2X3ByaXYpKQorCQlyZXR1 cm47CisJLyoKKwkgKiBUaGlzIHcvYSBpcyBuZWVkZWQgYXQgbGVhc3Qgb24gQ1BUL1BQVCwgYnV0 IHRvIGJlIHN1cmUgYXBwbHkgaXQKKwkgKiBldmVyeXdoZXJlIHdoZXJlIHJlZ2lzdGVycyBjYW4g YmUgd3JpdGUgcHJvdGVjdGVkLgorCSAqLworCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSB8 fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKKwkJcHBzX251bSA9IDI7CisJZWxzZQorCQlwcHNf bnVtID0gMTsKKworCWZvciAocHBzX2lkeCA9IDA7IHBwc19pZHggPCBwcHNfbnVtOyBwcHNfaWR4 KyspIHsKKwkJdTMyIHZhbCA9IEk5MTVfUkVBRChQUF9DT05UUk9MKHBwc19pZHgpKTsKKworCQl2 YWwgPSAodmFsICYgflBBTkVMX1VOTE9DS19NQVNLKSB8IFBBTkVMX1VOTE9DS19SRUdTOworCQlJ OTE1X1dSSVRFKFBQX0NPTlRST0wocHBzX2lkeCksIHZhbCk7CisJfQorfQorCiBzdGF0aWMgdm9p ZCBpbnRlbF9wcHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJ aWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpIHx8IElTX0JST1hUT04oZGV2X3ByaXYpKQpAQCAt MTQ2NDMsNiArMTQ2NjcsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcHNfaW5pdChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWRldl9wcml2LT5wcHNfbW1pb19iYXNlID0gVkxW X1BQU19CQVNFOwogCWVsc2UKIAkJZGV2X3ByaXYtPnBwc19tbWlvX2Jhc2UgPSBQUFNfQkFTRTsK KworCWludGVsX3Bwc191bmxvY2tfcmVnc193YShkZXZfcHJpdik7CiB9CiAKIHN0YXRpYyB2b2lk IGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcC5jCmluZGV4IDJlZjdiMTQuLjNkM2QzZmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwpAQCAtMTgyOSw3ICsxODI5LDggQEAgc3RhdGljICB1MzIgaXJvbmxha2VfZ2V0X3BwX2NvbnRy b2woc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZf cHJpdi0+cHBzX211dGV4KTsKIAogCWNvbnRyb2wgPSBJOTE1X1JFQUQoX3BwX2N0cmxfcmVnKGlu dGVsX2RwKSk7Ci0JaWYgKCFJU19CUk9YVE9OKGRldikpIHsKKwlpZiAoV0FSTl9PTighSEFTX0RE SShkZXZfcHJpdikgJiYKKwkJICAgICAoY29udHJvbCAmIFBBTkVMX1VOTE9DS19NQVNLKSAhPSBQ QU5FTF9VTkxPQ0tfUkVHUykpIHsKIAkJY29udHJvbCAmPSB+UEFORUxfVU5MT0NLX01BU0s7CiAJ CWNvbnRyb2wgfD0gUEFORUxfVU5MT0NLX1JFR1M7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAppbmRleCBjMjlhNDI5Li5jYmNlNzg2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAt MTE1OSw2ICsxMTU5LDcgQEAgdm9pZCBpbnRlbF9tYXJrX2J1c3koc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfbWFya19pZGxlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGludGVsX2NydGNfcmVzdG9yZV9tb2RlKHN0cnVjdCBk cm1fY3J0YyAqY3J0Yyk7CiBpbnQgaW50ZWxfZGlzcGxheV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpOwordm9pZCBpbnRlbF9wcHNfdW5sb2NrX3JlZ3Nfd2Eoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfZW5jb2Rlcl9kZXN0cm95KHN0cnVjdCBk cm1fZW5jb2RlciAqZW5jb2Rlcik7CiBpbnQgaW50ZWxfY29ubmVjdG9yX2luaXQoc3RydWN0IGlu dGVsX2Nvbm5lY3RvciAqKTsKIHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3Rv cl9hbGxvYyh2b2lkKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2 ZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYwppbmRleCBlNzlmYWU0Li42 NjhlYWJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCkBAIC05NzgsMTQgKzk3OCw2IEBA IHZvaWQgaW50ZWxfbHZkc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50IHBpcGU7 CiAJdTggcGluOwogCi0JLyoKLQkgKiBVbmxvY2sgcmVnaXN0ZXJzIGFuZCBqdXN0IGxlYXZlIHRo ZW0gdW5sb2NrZWQuIERvIHRoaXMgYmVmb3JlCi0JICogY2hlY2tpbmcgcXVpcmsgbGlzdHMgdG8g YXZvaWQgYm9ndXMgV0FSTklOR3MuCi0JICovCi0JaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYp IHx8IElOVEVMX0dFTihkZXZfcHJpdikgPD0gNCkKLQkJSTkxNV9XUklURShQUF9DT05UUk9MKDAp LAotCQkJICAgSTkxNV9SRUFEKFBQX0NPTlRST0woMCkpIHwgUEFORUxfVU5MT0NLX1JFR1MpOwot CiAJaWYgKCFpbnRlbF9sdmRzX3N1cHBvcnRlZChkZXYpKQogCQlyZXR1cm47CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwppbmRleCAxYzYwM2JiLi5kNjU5ZDZmIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC01OTIsNiArNTkyLDggQEAg dm9pZCBieHRfZGlzYWJsZV9kYzkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CURSTV9ERUJVR19LTVMoIkRpc2FibGluZyBEQzlcbiIpOwogCiAJZ2VuOV9zZXRfZGNfc3RhdGUo ZGV2X3ByaXYsIERDX1NUQVRFX0RJU0FCTEUpOworCisJaW50ZWxfcHBzX3VubG9ja19yZWdzX3dh KGRldl9wcml2KTsKIH0KIAogc3RhdGljIHZvaWQgYXNzZXJ0X2Nzcl9sb2FkZWQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQpAQCAtMTEyMSw2ICsxMTIzLDggQEAgc3RhdGljIHZv aWQgdmx2X2Rpc3BsYXlfcG93ZXJfd2VsbF9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAl9CiAKIAlpOTE1X3JlZGlzYWJsZV92Z2FfcG93ZXJfb24oJmRldl9wcml2LT5k cm0pOworCisJaW50ZWxfcHBzX3VubG9ja19yZWdzX3dhKGRldl9wcml2KTsKIH0KIAogc3RhdGlj IHZvaWQgdmx2X2Rpc3BsYXlfcG93ZXJfd2VsbF9kZWluaXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=