From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 03/11] drm/i915/psr: Share code between disable and exit Date: Fri, 30 Mar 2018 15:23:28 -0700 Message-ID: <20180330222336.5262-3-jose.souza@intel.com> References: <20180330222336.5262-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D1106E444 for ; Fri, 30 Mar 2018 22:26:56 +0000 (UTC) In-Reply-To: <20180330222336.5262-1-jose.souza@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 Cc: Dhinakaran Pandiyan , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org VGhlIGRpc2FibGUgYW5kIGV4aXQgc2VxdWVuY2UgYXJlIHZlcnkgc2ltaWxhciB3aXRoIGEgbG90 IGNvbW1vbgpjb2RlIGJldHdlZW4gYm90aCwgc28gaGVyZSBzaGFyaW5nIHRoZSBjb2RlLgoKU2ln bmVkLW9mZi1ieTogSm9zw6kgUm9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+ CkNjOiBEaGluYWthcmFuIFBhbmRpeWFuIDxkaGluYWthcmFuLnBhbmRpeWFuQGludGVsLmNvbT4K Q2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wc3IuYyB8IDg0ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgNDggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKaW5kZXggYThkMzAwMjgwYTJjLi5jYjcyZWUyNzQyMmYgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaApAQCAtNjE3LDcgKzYxNyw3IEBAIHN0cnVjdCBpOTE1X3BzciB7CiAJ dm9pZCAoKmVuYWJsZV9zaW5rKShzdHJ1Y3QgaW50ZWxfZHAgKik7CiAJdm9pZCAoKmFjdGl2YXRl KShzdHJ1Y3QgaW50ZWxfZHAgKik7CiAJdm9pZCAoKnNldHVwX3ZzYykoc3RydWN0IGludGVsX2Rw ICosIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICopOwotCXZvaWQgKCpleGl0KShzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwKTsKKwl2b2lkICgqZXhpdCkoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCwgYm9vbCBkaXNhYmxpbmcpOwogfTsKIAogZW51bSBpbnRlbF9wY2ggewpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wc3IuYwppbmRleCBiY2FhYzllNjlmOGMuLmQzNDUxYWZlYjhiYiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTY3MiwyMyArNjcyLDkgQEAgc3RhdGljIHZvaWQgdmx2 X3Bzcl9kaXNhYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YyA9IHRvX2ludGVsX2NydGMob2xkX2NydGNfc3RhdGUtPmJhc2UuY3J0Yyk7Ci0JdWludDMy X3QgdmFsOwogCiAJaWYgKGRldl9wcml2LT5wc3IuYWN0aXZlKSB7Ci0JCS8qIFB1dCBWTFYgUFNS IGJhY2sgdG8gUFNSX3N0YXRlIDAgKGRpc2FibGVkKS4gKi8KLQkJaWYgKGludGVsX3dhaXRfZm9y X3JlZ2lzdGVyKGRldl9wcml2LAotCQkJCQkgICAgVkxWX1BTUlNUQVQoY3J0Yy0+cGlwZSksCi0J CQkJCSAgICBWTFZfRURQX1BTUl9JTl9UUkFOUywKLQkJCQkJICAgIDAsCi0JCQkJCSAgICAxKSkK LQkJCVdBUk4oMSwgIlBTUiB0cmFuc2l0aW9uIHRvb2sgbG9uZ2VyIHRoYW4gZXhwZWN0ZWRcbiIp OwotCi0JCXZhbCA9IEk5MTVfUkVBRChWTFZfUFNSQ1RMKGNydGMtPnBpcGUpKTsKLQkJdmFsICY9 IH5WTFZfRURQX1BTUl9BQ1RJVkVfRU5UUlk7Ci0JCXZhbCAmPSB+VkxWX0VEUF9QU1JfRU5BQkxF OwotCQl2YWwgJj0gflZMVl9FRFBfUFNSX01PREVfTUFTSzsKLQkJSTkxNV9XUklURShWTFZfUFNS Q1RMKGNydGMtPnBpcGUpLCB2YWwpOwotCisJCWRldl9wcml2LT5wc3IuZXhpdChpbnRlbF9kcCwg dHJ1ZSk7CiAJCWRldl9wcml2LT5wc3IuYWN0aXZlID0gZmFsc2U7CiAJfSBlbHNlIHsKIAkJV0FS Tl9PTih2bHZfaXNfcHNyX2FjdGl2ZV9vbl9waXBlKGRldiwgY3J0Yy0+cGlwZSkpOwpAQCAtNzAz LDMxICs2ODksNyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGRldik7CiAKIAlpZiAoZGV2X3ByaXYtPnBzci5hY3RpdmUpIHsKLQkJaTkxNV9yZWdfdCBwc3Jf c3RhdHVzOwotCQl1MzIgcHNyX3N0YXR1c19tYXNrOwotCi0JCWlmIChkZXZfcHJpdi0+cHNyLnBz cjJfZW5hYmxlZCkgewotCQkJcHNyX3N0YXR1cyA9IEVEUF9QU1IyX1NUQVRVUzsKLQkJCXBzcl9z dGF0dXNfbWFzayA9IEVEUF9QU1IyX1NUQVRVU19TVEFURV9NQVNLOwotCi0JCQlJOTE1X1dSSVRF KEVEUF9QU1IyX0NUTCwKLQkJCQkgICBJOTE1X1JFQUQoRURQX1BTUjJfQ1RMKSAmCi0JCQkJICAg fihFRFBfUFNSMl9FTkFCTEUgfCBFRFBfU1VfVFJBQ0tfRU5BQkxFKSk7Ci0KLQkJfSBlbHNlIHsK LQkJCXBzcl9zdGF0dXMgPSBFRFBfUFNSX1NUQVRVUzsKLQkJCXBzcl9zdGF0dXNfbWFzayA9IEVE UF9QU1JfU1RBVFVTX1NUQVRFX01BU0s7Ci0KLQkJCUk5MTVfV1JJVEUoRURQX1BTUl9DVEwsCi0J CQkJICAgSTkxNV9SRUFEKEVEUF9QU1JfQ1RMKSAmIH5FRFBfUFNSX0VOQUJMRSk7Ci0JCX0KLQot CQkvKiBXYWl0IHRpbGwgUFNSIGlzIGlkbGUgKi8KLQkJaWYgKGludGVsX3dhaXRfZm9yX3JlZ2lz dGVyKGRldl9wcml2LAotCQkJCQkgICAgcHNyX3N0YXR1cywgcHNyX3N0YXR1c19tYXNrLCAwLAot CQkJCQkgICAgMjAwMCkpCi0JCQlEUk1fRVJST1IoIlRpbWVkIG91dCB3YWl0aW5nIGZvciBQU1Ig SWRsZSBTdGF0ZVxuIik7Ci0KKwkJZGV2X3ByaXYtPnBzci5leGl0KGludGVsX2RwLCB0cnVlKTsK IAkJZGV2X3ByaXYtPnBzci5hY3RpdmUgPSBmYWxzZTsKIAl9IGVsc2UgewogCQlpZiAoZGV2X3By aXYtPnBzci5wc3IyX2VuYWJsZWQpCkBAIC04MzgsMjUgKzgwMCw0MSBAQCBzdGF0aWMgdm9pZCBp bnRlbF9wc3Jfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJbXV0ZXhfdW5sb2NrKCZk ZXZfcHJpdi0+cHNyLmxvY2spOwogfQogCi1zdGF0aWMgdm9pZCBoc3dfcHNyX2V4aXQoc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCkKK3N0YXRpYyB2b2lkIGhzd19wc3JfZXhpdChzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwLCBib29sIGRpc2FibGluZykKIHsKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRh bF9wb3J0ICpkaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCWk5MTVfcmVnX3QgcHNyX3N0YXR1 czsKKwl1MzIgcHNyX3N0YXR1c19tYXNrOwogCXUzMiB2YWw7CiAKIAlpZiAoZGV2X3ByaXYtPnBz ci5wc3IyX2VuYWJsZWQpIHsKKwkJcHNyX3N0YXR1cyA9IEVEUF9QU1IyX1NUQVRVUzsKKwkJcHNy X3N0YXR1c19tYXNrID0gRURQX1BTUjJfU1RBVFVTX1NUQVRFX01BU0s7CisKIAkJdmFsID0gSTkx NV9SRUFEKEVEUF9QU1IyX0NUTCk7Ci0JCVdBUk5fT04oISh2YWwgJiBFRFBfUFNSMl9FTkFCTEUp KTsKLQkJSTkxNV9XUklURShFRFBfUFNSMl9DVEwsIHZhbCAmIH5FRFBfUFNSMl9FTkFCTEUpOwor CQlXQVJOX09OKCFkaXNhYmxpbmcgJiYgISh2YWwgJiBFRFBfUFNSMl9FTkFCTEUpKTsKKwkJdmFs ICY9IH5FRFBfUFNSMl9FTkFCTEU7CisJCWlmIChkaXNhYmxpbmcpCisJCQl2YWwgJj0gfkVEUF9T VV9UUkFDS19FTkFCTEU7CisJCUk5MTVfV1JJVEUoRURQX1BTUjJfQ1RMLCB2YWwpOwogCX0gZWxz ZSB7CisJCXBzcl9zdGF0dXMgPSBFRFBfUFNSX1NUQVRVUzsKKwkJcHNyX3N0YXR1c19tYXNrID0g RURQX1BTUl9TVEFUVVNfU1RBVEVfTUFTSzsKKwogCQl2YWwgPSBJOTE1X1JFQUQoRURQX1BTUl9D VEwpOwotCQlXQVJOX09OKCEodmFsICYgRURQX1BTUl9FTkFCTEUpKTsKKwkJV0FSTl9PTighZGlz YWJsaW5nICYmICEodmFsICYgRURQX1BTUl9FTkFCTEUpKTsKIAkJSTkxNV9XUklURShFRFBfUFNS X0NUTCwgdmFsICYgfkVEUF9QU1JfRU5BQkxFKTsKIAl9CisKKwkvKiBXaGVuIGRpc2FibGluZyB3 YWl0IHRpbGwgUFNSIGlzIGlkbGUgKi8KKwlpZiAoZGlzYWJsaW5nICYmIGludGVsX3dhaXRfZm9y X3JlZ2lzdGVyKGRldl9wcml2LCBwc3Jfc3RhdHVzLAorCQkJCQkJIHBzcl9zdGF0dXNfbWFzaywg MCwgMjAwMCkpCisJCURSTV9FUlJPUigiVGltZWQgb3V0IHdhaXRpbmcgZm9yIFBTUiBJZGxlIFN0 YXRlXG4iKTsKIH0KIAotc3RhdGljIHZvaWQgdmx2X3Bzcl9leGl0KHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHApCitzdGF0aWMgdm9pZCB2bHZfcHNyX2V4aXQoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCwgYm9vbCBkaXNhYmxpbmcpCiB7CiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqZGln X3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGRpZ19wb3J0LT5iYXNlLmJhc2UuZGV2OwpAQCAtODY1LDEwICs4NDMsMTQgQEAgc3RhdGlj IHZvaWQgdmx2X3Bzcl9leGl0KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJZW51bSBwaXBl IHBpcGUgPSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlOwogCXUzMiB2YWw7CiAKKwlpZiAoZGlz YWJsaW5nICYmIGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyKGRldl9wcml2LCBWTFZfUFNSU1RBVChw aXBlKSwKKwkJCQkJCSBWTFZfRURQX1BTUl9JTl9UUkFOUywgMCwgMSkpCisJCURSTV9XQVJOKCJQ U1IgdHJhbnNpdGlvbiB0b29rIGxvbmdlciB0aGFuIGV4cGVjdGVkXG4iKTsKKwogCXZhbCA9IEk5 MTVfUkVBRChWTFZfUFNSQ1RMKHBpcGUpKTsKIAogCS8qCi0JICogSGVyZSB3ZSBkbyB0aGUgdHJh bnNpdGlvbiBkcmlyZWN0bHkgZnJvbQorCSAqIEhlcmUgd2UgZG8gdGhlIHRyYW5zaXRpb24gZGly ZWN0bHkgZnJvbQogCSAqIFBTUl9zdGF0ZSAzIChhY3RpdmUgLSBubyBSZW1vdGUgRnJhbWUgQnVm ZmVyIChSRkIpIHVwZGF0ZSkgdG8KIAkgKiBQU1Jfc3RhdGUgNSAoZXhpdCkuCiAJICogUFNSIFN0 YXRlIDQgKGFjdGl2ZSB3aXRoIHNpbmdsZSBmcmFtZSB1cGRhdGUpIGNhbiBiZSBza2lwcGVkLgpA QCAtODc3LDggKzg1OSwxNiBAQCBzdGF0aWMgdm9pZCB2bHZfcHNyX2V4aXQoc3RydWN0IGludGVs X2RwICppbnRlbF9kcCkKIAkgKiBOb3cgd2UgYXJlIGF0IFNhbWUgc3RhdGUgYWZ0ZXIgdmx2X3Bz cl9lbmFibGVfc291cmNlLgogCSAqLwogCXZhbCAmPSB+VkxWX0VEUF9QU1JfQUNUSVZFX0VOVFJZ OworCWlmIChkaXNhYmxpbmcpIHsKKwkJLyogUHV0IFZMViBQU1IgYmFjayB0byBQU1Jfc3RhdGUg MCAoZGlzYWJsZWQpLiAqLworCQl2YWwgJj0gflZMVl9FRFBfUFNSX0VOQUJMRTsKKwkJdmFsICY9 IH5WTFZfRURQX1BTUl9NT0RFX01BU0s7CisJfQogCUk5MTVfV1JJVEUoVkxWX1BTUkNUTChwaXBl KSwgdmFsKTsKIAorCWlmIChkaXNhYmxpbmcpCisJCXJldHVybjsKKwogCS8qCiAJICogU2VuZCBB VVggd2FrZSB1cCAtIFNwZWMgc2F5cyBhZnRlciB0cmFuc2l0aW9uaW5nIHRvIFBTUgogCSAqIGFj dGl2ZSB3ZSBoYXZlIHRvIHNlbmQgQVVYIHdha2UgdXAgYnkgd3JpdGluZyAwMWggaW4gRFBDRApA QCAtODk4LDcgKzg4OCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bzcl9leGl0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoIWRldl9wcml2LT5wc3IuYWN0aXZlKQogCQly ZXR1cm47CiAKLQlkZXZfcHJpdi0+cHNyLmV4aXQoaW50ZWxfZHApOworCWRldl9wcml2LT5wc3Iu ZXhpdChpbnRlbF9kcCwgZmFsc2UpOwogCWRldl9wcml2LT5wc3IuYWN0aXZlID0gZmFsc2U7CiB9 CiAKLS0gCjIuMTYuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==