From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 5/6] drm/i915: Apply the PPS register unlock workaround more consistently Date: Tue, 9 Aug 2016 14:34:11 +0300 Message-ID: <1470742452-5240-6-git-send-email-imre.deak@intel.com> References: <1470742452-5240-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id B87FA6E552 for ; Tue, 9 Aug 2016 11:34:18 +0000 (UTC) In-Reply-To: <1470742452-5240-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 QXRtLCB3ZSBhcHBseSB0aGlzIHdvcmthcm91bmQgc29tZXdoYXQgaW5jb25zaXN0ZW50bHkgYXQg dGhlIGZvbGxvd2luZwpwb2ludHM6IGRyaXZlciBsb2FkaW5nLCBMVkRTIGluaXQsIGVEUCBQUFMg aW5pdCwgc3lzdGVtIHJlc3VtZS4gQXMgdGhpcwp3b3JrYXJvdW5kIGFsc28gYWZmZWN0cyByZWdp c3RlcnMgb3RoZXIgdGhhbiBQUFMgKHRpbWluZywgUExMKSBhIG1vcmUKY29uc2lzdGVudCB3YXkg aXMgdG8gYXBwbHkgaXQgZWFybHkgYWZ0ZXIgdGhlIFBQUyBIVyBjb250ZXh0IGlzIGtub3duIHRv CmJlIGxvc3Q6IGRyaXZlciBsb2FkaW5nLCBzeXN0ZW0gcmVzdW1lIGFuZCBvbiBWTFYvQ0hWL0JY VCB3aGVuIHR1cm5pbmcKb24gcG93ZXIgZG9tYWlucy4KClRoaXMgaXMgbmVlZGVkIGJ5IHRoZSBu ZXh0IHBhdGNoIHRoYXQgcmVtb3ZlcyBzYXZpbmcvcmVzdG9yaW5nIG9mIHRoZQpQUF9DT05UUk9M IHJlZ2lzdGVyLgoKVGhpcyBhbHNvIHJlbW92ZXMgdGhlIGluY29ycmVjdCBwcm9ncmFtbWluZyBv ZiB0aGUgd29ya2Fyb3VuZCBvbiBIU1crClBDSCBwbGF0Zm9ybXMgd2hpY2ggZG9uJ3QgaGF2ZSB0 aGUgcmVnaXN0ZXIgbG9ja2luZyBtZWNoYW5pc20uCgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsg PGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyAgICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAg IHwgMjggKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHAuYyAgICAgICAgIHwgIDQgKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jICAg ICAgIHwgIDggLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0u YyB8ICA0ICsrKysKIDYgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA4Y2ZjMjY0Li4wZmNkMWMwIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE1NjAsNiArMTU2MCw3IEBAIHN0YXRpYyBpbnQgaTkx NV9kcm1fcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaTkxNV9nZW1fcmVzdW1lKGRl dik7CiAKIAlpOTE1X3Jlc3RvcmVfc3RhdGUoZGV2KTsKKwlpbnRlbF9wcHNfdW5sb2NrX3JlZ3Nf d2EoZGV2X3ByaXYpOwogCWludGVsX29wcmVnaW9uX3NldHVwKGRldl9wcml2KTsKIAogCWludGVs X2luaXRfcGNoX3JlZmNsayhkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IDNkNWZkMDYuLmRjNGU2MDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTE0NjM1LDYgKzE0NjM1LDMyIEBAIHN0YXRpYyBib29sIGludGVsX2NydF9wcmVzZW50KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIHRydWU7CiB9CiAKK3ZvaWQgaW50ZWxfcHBz X3VubG9ja19yZWdzX3dhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlp bnQgcHBzX251bTsKKwlpbnQgcHBzX2lkeDsKKworCS8qCisJICogVGhpcyB3L2EgaXMgbmVlZGVk IGF0IGxlYXN0IG9uIENQVC9QUFQsIGJ1dCB0byBiZSBzdXJlIGFwcGx5IGl0CisJICogZXZlcnl3 aGVyZSB3aGVyZSByZWdpc3RlcnMgY2FuIGJlIHdyaXRlIHByb3RlY3RlZC4KKwkgKi8KKwlpZiAo SU5URUxfR0VOKGRldl9wcml2KSA8PSA0IHx8CisJICAgIEhBU19QQ0hfSUJYKGRldl9wcml2KSB8 fCBIQVNfUENIX0NQVChkZXZfcHJpdikpCisJCXBwc19udW0gPSAxOworCWVsc2UgaWYgKElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpIHx8CisJCSBJU19C Uk9YVE9OKGRldl9wcml2KSkKKwkJcHBzX251bSA9IDI7CisJZWxzZQorCQlwcHNfbnVtID0gMDsK KworCWZvciAocHBzX2lkeCA9IDA7IHBwc19pZHggPCBwcHNfbnVtOyBwcHNfaWR4KyspIHsKKwkJ dTMyIHZhbCA9IEk5MTVfUkVBRChQUF9DT05UUk9MKHBwc19pZHgpKTsKKworCQl2YWwgPSAodmFs ICYgflBBTkVMX1VOTE9DS19NQVNLKSB8IFBBTkVMX1VOTE9DS19SRUdTOworCQlJOTE1X1dSSVRF KFBQX0NPTlRST0wocHBzX2lkeCksIHZhbCk7CisJfQorfQorCiBzdGF0aWMgdm9pZCBpbnRlbF9w cHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaWYgKEhBU19Q Q0hfU1BMSVQoZGV2X3ByaXYpIHx8IElTX0JST1hUT04oZGV2X3ByaXYpKQpAQCAtMTQ2NDMsNiAr MTQ2NjksOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJCWRldl9wcml2LT5wcHNfbW1pb19iYXNlID0gVkxWX1BQU19CQVNF OwogCWVsc2UKIAkJZGV2X3ByaXYtPnBwc19tbWlvX2Jhc2UgPSBQUFNfQkFTRTsKKworCWludGVs X3Bwc191bmxvY2tfcmVnc193YShkZXZfcHJpdik7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX3Nl dHVwX291dHB1dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j CmluZGV4IDc2ZjViNzIuLmIyN2YxYzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTgy OSw3ICsxODI5LDkgQEAgc3RhdGljICB1MzIgaXJvbmxha2VfZ2V0X3BwX2NvbnRyb2woc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCkKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+cHBz X211dGV4KTsKIAogCWNvbnRyb2wgPSBJOTE1X1JFQUQoX3BwX2N0cmxfcmVnKGludGVsX2RwKSk7 Ci0JaWYgKCFJU19CUk9YVE9OKGRldikpIHsKKwlpZiAoV0FSTl9PTigoSEFTX1BDSF9JQlgoZGV2 X3ByaXYpIHx8IEhBU19QQ0hfQ1BUKGRldl9wcml2KSB8fAorCQkgICAgIElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSAmJgorCQkgICAgIChjb250cm9s ICYgUEFORUxfVU5MT0NLX01BU0spICE9IFBBTkVMX1VOTE9DS19SRUdTKSkgewogCQljb250cm9s ICY9IH5QQU5FTF9VTkxPQ0tfTUFTSzsKIAkJY29udHJvbCB8PSBQQU5FTF9VTkxPQ0tfUkVHUzsK IAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGMyOWE0MjkuLmNiY2U3ODYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMTU5LDYgKzExNTksNyBAQCB2b2lkIGludGVsX21h cmtfYnVzeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9t YXJrX2lkbGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxf Y3J0Y19yZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIGludCBpbnRlbF9kaXNw bGF5X3N1c3BlbmQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIGludGVsX3Bwc191bmxv Y2tfcmVnc193YShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRl bF9lbmNvZGVyX2Rlc3Ryb3koc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKTsKIGludCBpbnRl bF9jb25uZWN0b3JfaW5pdChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICopOwogc3RydWN0IGludGVs X2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yX2FsbG9jKHZvaWQpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHZkcy5jCmluZGV4IGQ1MTU4ZTUuLjlhNmUxYWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2x2ZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s dmRzLmMKQEAgLTk2NywxNCArOTY3LDYgQEAgdm9pZCBpbnRlbF9sdmRzX2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlpbnQgcGlwZTsKIAl1OCBwaW47CiAKLQkvKgotCSAqIFVubG9jayBy ZWdpc3RlcnMgYW5kIGp1c3QgbGVhdmUgdGhlbSB1bmxvY2tlZC4gRG8gdGhpcyBiZWZvcmUKLQkg KiBjaGVja2luZyBxdWlyayBsaXN0cyB0byBhdm9pZCBib2d1cyBXQVJOSU5Hcy4KLQkgKi8KLQlp ZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikgfHwgSU5URUxfR0VOKGRldl9wcml2KSA8PSA0KQot CQlJOTE1X1dSSVRFKFBQX0NPTlRST0woMCksCi0JCQkgICBJOTE1X1JFQUQoUFBfQ09OVFJPTCgw KSkgfCBQQU5FTF9VTkxPQ0tfUkVHUyk7Ci0KIAlpZiAoIWludGVsX2x2ZHNfc3VwcG9ydGVkKGRl dikpCiAJCXJldHVybjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmlu ZGV4IDFjNjAzYmIuLjhmNTFhZTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMKQEAgLTU5Miw2ICs1OTIsOCBAQCB2b2lkIGJ4dF9kaXNhYmxlX2RjOShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJRFJNX0RFQlVHX0tNUygiRGlzYWJsaW5nIERDOVxu Iik7CiAKIAlnZW45X3NldF9kY19zdGF0ZShkZXZfcHJpdiwgRENfU1RBVEVfRElTQUJMRSk7CisK KwlpbnRlbF9wcHNfdW5sb2NrX3JlZ3Nfd2EoZGV2X3ByaXYpOwogfQogCiBzdGF0aWMgdm9pZCBh c3NlcnRfY3NyX2xvYWRlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC0x MTQ1LDYgKzExNDcsOCBAQCBzdGF0aWMgdm9pZCB2bHZfZGlzcGxheV9wb3dlcl93ZWxsX2VuYWJs ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJdmx2X3NldF9wb3dlcl93ZWxs KGRldl9wcml2LCBwb3dlcl93ZWxsLCB0cnVlKTsKIAogCXZsdl9kaXNwbGF5X3Bvd2VyX3dlbGxf aW5pdChkZXZfcHJpdik7CisKKwlpbnRlbF9wcHNfdW5sb2NrX3JlZ3Nfd2EoZGV2X3ByaXYpOwog fQogCiBzdGF0aWMgdm9pZCB2bHZfZGlzcGxheV9wb3dlcl93ZWxsX2Rpc2FibGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=