From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH 33/41] drm/rockchip: Disable VOP windows when PSR is active Date: Thu, 9 Mar 2017 23:32:48 -0500 Message-ID: <20170310043305.17216-34-seanpaul@chromium.org> References: <20170310043305.17216-1-seanpaul@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-x234.google.com (mail-qk0-x234.google.com [IPv6:2607:f8b0:400d:c09::234]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA2A76EDA1 for ; Fri, 10 Mar 2017 04:49:52 +0000 (UTC) Received: by mail-qk0-x234.google.com with SMTP id 1so151786865qkl.3 for ; Thu, 09 Mar 2017 20:49:52 -0800 (PST) In-Reply-To: <20170310043305.17216-1-seanpaul@chromium.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org Cc: zain wang , Douglas Anderson , Tomasz Figa , "Kristian H . Kristensen" , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogemFpbiB3YW5nIDx3enpAcm9jay1jaGlwcy5jb20+CgpXZSBkbyBub3QgaGF2ZSB0byBk cml2ZSB0aGUgZGlzcGxheSB3aGVuIGl0IGlzIGluIFBTUiBtb2RlLCBzbyB3ZSBjYW4Kc2F2ZSBz b21lIHBvd2VyIGJ5IGRpc2FibGluZyBhY3RpdmUgVk9QIHdpbmRvd3MsIHVudGlsIGEgbmV4dCBQ U1IgZmx1c2gKdHVybnMgdGhlbSBiYWNrIG9uLgoKQ2M6IEtyaXN0aWFuIEguIEtyaXN0ZW5zZW4g PGhvZWdzYmVyZ0BjaHJvbWl1bS5vcmc+ClNpZ25lZC1vZmYtYnk6IHphaW4gd2FuZyA8d3p6QHJv Y2stY2hpcHMuY29tPgpTaWduZWQtb2ZmLWJ5OiBUb21hc3ogRmlnYSA8dGZpZ2FAY2hyb21pdW0u b3JnPgpTaWduZWQtb2ZmLWJ5OiBEb3VnbGFzIEFuZGVyc29uIDxkaWFuZGVyc0BjaHJvbWl1bS5v cmc+ClNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1yb2NrY2hpcC5jIHwgMzQgKysr KysrKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlw X2RybV9kcnYuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBf ZHJtX3ZvcC5jICAgICB8IDMxICsrKysrKysrKysrKysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdl ZCwgNTUgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMgYi9kcml2ZXJzL2dwdS9k cm0vcm9ja2NoaXAvYW5hbG9naXhfZHAtcm9ja2NoaXAuYwppbmRleCAwNjE0ZDMyYzU0MzUuLmRl MjNjYzZmZDA1ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4 X2RwLXJvY2tjaGlwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2Rw LXJvY2tjaGlwLmMKQEAgLTkxLDE5ICs5MSwzMSBAQCBzdGF0aWMgaW50IGFuYWxvZ2l4X2RwX3Bz cl9zZXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLCBib29sIGVuYWJsZWQpCiAJaWYgKCFj cnRjKQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCXZhY3RfZW5kID0gY3J0Yy0+bW9kZS52dG90YWwg LSBjcnRjLT5tb2RlLnZzeW5jX3N0YXJ0ICsgY3J0Yy0+bW9kZS52ZGlzcGxheTsKKwlpZiAoZW5h YmxlZCkgeworCQl2YWN0X2VuZCA9IGNydGMtPm1vZGUudnRvdGFsIC0gY3J0Yy0+bW9kZS52c3lu Y19zdGFydCArCisJCQljcnRjLT5tb2RlLnZkaXNwbGF5OworCQlyZXQgPSByb2NrY2hpcF9kcm1f d2FpdF9saW5lX2ZsYWcoZHAtPmVuY29kZXIuY3J0YywgdmFjdF9lbmQsCisJCQkJCQlQU1JfV0FJ VF9MSU5FX0ZMQUdfVElNRU9VVF9NUyk7CisJCWlmIChyZXQpIHsKKwkJCWRldl9lcnIoZHAtPmRl diwgImxpbmUgZmxhZyBpbnRlcnJ1cHQgZGlkIG5vdCBhcnJpdmVcbiIpOworCQkJcmV0dXJuIC1F VElNRURPVVQ7CisJCX0KIAotCXJldCA9IHJvY2tjaGlwX2RybV93YWl0X2xpbmVfZmxhZyhkcC0+ ZW5jb2Rlci5jcnRjLCB2YWN0X2VuZCwKLQkJCQkJICBQU1JfV0FJVF9MSU5FX0ZMQUdfVElNRU9V VF9NUyk7Ci0JaWYgKHJldCkgewotCQlkZXZfZXJyKGRwLT5kZXYsICJsaW5lIGZsYWcgaW50ZXJy dXB0IGRpZCBub3QgYXJyaXZlXG4iKTsKLQkJcmV0dXJuIC1FVElNRURPVVQ7CisJCXJldCA9IGFu YWxvZ2l4X2RwX2VuYWJsZV9wc3IoZHAtPmRldik7CisJCWlmIChyZXQpIHsKKwkJCWRldl9lcnIo ZHAtPmRldiwgImZhaWxlZCB0byBlbmFibGUgcHNyICVkXG4iLCByZXQpOworCQkJcmV0dXJuIHJl dDsKKwkJfQorCQlyb2NrY2hpcF9kcm1fc2V0X3dpbl9lbmFibGVkKGNydGMsIGZhbHNlKTsKKwl9 IGVsc2UgeworCQlyb2NrY2hpcF9kcm1fc2V0X3dpbl9lbmFibGVkKGNydGMsIHRydWUpOworCQly ZXQgPSBhbmFsb2dpeF9kcF9kaXNhYmxlX3BzcihkcC0+ZGV2KTsKKwkJaWYgKHJldCkgeworCQkJ ZGV2X2VycihkcC0+ZGV2LCAiZmFpbGVkIHRvIGRpc2FibGUgcHNyICVkXG4iLCByZXQpOworCQkJ cmV0dXJuIHJldDsKKwkJfQogCX0KLQotCWlmIChlbmFibGVkKQotCQlyZXR1cm4gYW5hbG9naXhf ZHBfZW5hYmxlX3BzcihkcC0+ZGV2KTsKLQllbHNlCi0JCXJldHVybiBhbmFsb2dpeF9kcF9kaXNh YmxlX3BzcihkcC0+ZGV2KTsKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludCByb2NrY2hpcF9k cF9wcmVfaW5pdChzdHJ1Y3Qgcm9ja2NoaXBfZHBfZGV2aWNlICpkcCkKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5oCmluZGV4IGE5NjZkMWQzNzM3OC4uYmU0YWQ5 YjY3MGNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJt X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmgK QEAgLTY1LDUgKzY1LDYgQEAgdm9pZCByb2NrY2hpcF9kcm1fZG1hX2RldGFjaF9kZXZpY2Uoc3Ry dWN0IGRybV9kZXZpY2UgKmRybV9kZXYsCiAJCQkJICAgIHN0cnVjdCBkZXZpY2UgKmRldik7CiBp bnQgcm9ja2NoaXBfZHJtX3dhaXRfbGluZV9mbGFnKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgdW5z aWduZWQgaW50IGxpbmVfbnVtLAogCQkJCXVuc2lnbmVkIGludCBtc3RpbWVvdXQpOwordm9pZCBy b2NrY2hpcF9kcm1fc2V0X3dpbl9lbmFibGVkKHN0cnVjdCBkcm1fY3J0YyAqY3RyYywgYm9vbCBl bmFibGVkKTsKIAogI2VuZGlmIC8qIF9ST0NLQ0hJUF9EUk1fRFJWX0hfICovCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jIGIvZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYwppbmRleCA4NzllZmMzYTZjNjcuLmU5 MGEzMmVlNWEzNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlw X2RybV92b3AuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3Zv cC5jCkBAIC04OSw2ICs4OSw5IEBACiAjZGVmaW5lIFZPUF9XSU5fR0VUX1lSR0JBRERSKHZvcCwg d2luKSBcCiAJCXZvcF9yZWFkbCh2b3AsIHdpbi0+YmFzZSArIHdpbi0+cGh5LT55cmdiX21zdC5v ZmZzZXQpCiAKKyNkZWZpbmUgVk9QX1dJTl9UT19JTkRFWCh2b3Bfd2luKSBcCisJKCh2b3Bfd2lu KSAtICh2b3Bfd2luKS0+dm9wLT53aW4pCisKICNkZWZpbmUgdG9fdm9wKHgpIGNvbnRhaW5lcl9v Zih4LCBzdHJ1Y3Qgdm9wLCBjcnRjKQogI2RlZmluZSB0b192b3Bfd2luKHgpIGNvbnRhaW5lcl9v Zih4LCBzdHJ1Y3Qgdm9wX3dpbiwgYmFzZSkKIApAQCAtMTA4LDYgKzExMSw4IEBAIHN0cnVjdCB2 b3AgewogCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2OwogCWJvb2wgaXNfZW5hYmxlZDsKIAor CXVuc2lnbmVkIGludCB3aW5fZW5hYmxlZDsKKwogCXN0cnVjdCBjb21wbGV0aW9uIGRzcF9ob2xk X2NvbXBsZXRpb247CiAKIAkvKiBwcm90ZWN0ZWQgYnkgZGV2LT5ldmVudF9sb2NrICovCkBAIC01 NjIsNiArNTY3LDI3IEBAIHN0YXRpYyBpbnQgdm9wX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNy dGMpCiAJcmV0dXJuIHJldDsKIH0KIAordm9pZCByb2NrY2hpcF9kcm1fc2V0X3dpbl9lbmFibGVk KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBlbmFibGVkKQoreworCXN0cnVjdCB2b3AgKnZv cCA9IHRvX3ZvcChjcnRjKTsKKwlpbnQgaTsKKworCXNwaW5fbG9jaygmdm9wLT5yZWdfbG9jayk7 CisKKwlmb3IgKGkgPSAwOyBpIDwgdm9wLT5kYXRhLT53aW5fc2l6ZTsgaSsrKSB7CisJCXN0cnVj dCB2b3Bfd2luICp2b3Bfd2luID0gJnZvcC0+d2luW2ldOworCQljb25zdCBzdHJ1Y3Qgdm9wX3dp bl9kYXRhICp3aW4gPSB2b3Bfd2luLT5kYXRhOworCisJCVZPUF9XSU5fU0VUKHZvcCwgd2luLCBl bmFibGUsCisJCQkgICAgZW5hYmxlZCAmJiAodm9wLT53aW5fZW5hYmxlZCAmIEJJVChpKSkpOwor CX0KKworCXZvcF9jZmdfZG9uZSh2b3ApOworCisJc3Bpbl91bmxvY2soJnZvcC0+cmVnX2xvY2sp OworfQorRVhQT1JUX1NZTUJPTChyb2NrY2hpcF9kcm1fc2V0X3dpbl9lbmFibGVkKTsKKwogc3Rh dGljIHZvaWQgdm9wX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3Ry dWN0IHZvcCAqdm9wID0gdG9fdm9wKGNydGMpOwpAQCAtNTgxLDYgKzYwNyw3IEBAIHN0YXRpYyB2 b2lkIHZvcF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJCXNwaW5fbG9j aygmdm9wLT5yZWdfbG9jayk7CiAJCVZPUF9XSU5fU0VUKHZvcCwgd2luLCBlbmFibGUsIDApOwor CQl2b3AtPndpbl9lbmFibGVkICY9IH5CSVQoaSk7CiAJCXNwaW5fdW5sb2NrKCZ2b3AtPnJlZ19s b2NrKTsKIAl9CiAKQEAgLTcwMCw2ICs3MjcsNyBAQCBzdGF0aWMgdm9pZCB2b3BfcGxhbmVfYXRv bWljX2Rpc2FibGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJc3Bpbl9sb2NrKCZ2b3AtPnJl Z19sb2NrKTsKIAogCVZPUF9XSU5fU0VUKHZvcCwgd2luLCBlbmFibGUsIDApOworCXZvcC0+d2lu X2VuYWJsZWQgJj0gfkJJVChWT1BfV0lOX1RPX0lOREVYKHZvcF93aW4pKTsKIAogCXNwaW5fdW5s b2NrKCZ2b3AtPnJlZ19sb2NrKTsKIH0KQEAgLTgwNyw2ICs4MzUsOCBAQCBzdGF0aWMgdm9pZCB2 b3BfcGxhbmVfYXRvbWljX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAl9CiAKIAlW T1BfV0lOX1NFVCh2b3AsIHdpbiwgZW5hYmxlLCAxKTsKKwl2b3AtPndpbl9lbmFibGVkIHw9IEJJ VChWT1BfV0lOX1RPX0lOREVYKHZvcF93aW4pKTsKKwogCXNwaW5fdW5sb2NrKCZ2b3AtPnJlZ19s b2NrKTsKIH0KIApAQCAtMTQ0Myw2ICsxNDczLDcgQEAgc3RhdGljIGludCB2b3BfaW5pdGlhbChz dHJ1Y3Qgdm9wICp2b3ApCiAJCWNvbnN0IHN0cnVjdCB2b3Bfd2luX2RhdGEgKndpbiA9ICZ2b3Bf ZGF0YS0+d2luW2ldOwogCiAJCVZPUF9XSU5fU0VUKHZvcCwgd2luLCBlbmFibGUsIDApOworCQl2 b3AtPndpbl9lbmFibGVkICY9IH5CSVQoaSk7CiAJfQogCiAJdm9wX2NmZ19kb25lKHZvcCk7Ci0t IAoyLjEyLjAuMjQ2LmdhMmVjYzg0ODY2LWdvb2cKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=