From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v2 2/6] drm/i915/psr: Always wait for idle state when disabling PSR Date: Wed, 10 Oct 2018 17:41:20 -0700 Message-ID: <20181011004124.4110-2-jose.souza@intel.com> References: <20181011004124.4110-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 90BB289B27 for ; Thu, 11 Oct 2018 00:41:27 +0000 (UTC) In-Reply-To: <20181011004124.4110-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 SXQgc2hvdWxkIGFsd2F5cyB3YWl0IGZvciBpZGxlIHN0YXRlIHdoZW4gZGlzYWJsaW5nIFBTUiBi ZWNhdXNlIFBTUgpjb3VsZCBiZSBpbmFjdGl2ZSBkdWUgYSBjYWxsIHRvIGludGVsX3Bzcl9leGl0 KCkgYW5kIHdoaWxlIFBTUiBpcwpzdGlsbCBiZWluZyBkaXNhYmxlZCBhc3luY2hyb25vdXNseSB1 c2Vyc3BhY2UgY291bGQgY2hhbmdlIHRoZQptb2Rlc2V0IGNhdXNpbmcgYSBjYWxsIHRvIHBzcl9k aXNhYmxlKCkgdGhhdCB3aWxsIG5vdCB3YWl0IGZvciBQU1IKaWRsZSBhbmQgdGhlbiBQU1Igd2ls bCBiZSBlbmFibGVkIGFnYWluIHdoaWxlIFBTUiBpcyBzdGlsbCBub3QgaWRsZS4KCnYyOiByZWJh c2VkIG9uIHRvcCBvZiB0aGUgcGF0Y2ggcmV1c2luZyBwc3JfZXhpdCgpCgpDYzogUm9kcmlnbyBW aXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhp bmFrYXJhbi5wYW5kaXlhbkBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEpvc8OpIFJvYmVydG8g ZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Bzci5jIHwgNDEgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Bzci5jCmluZGV4IGY2OThiM2Y0NWM2ZC4uMTZkMGUzZGY3ZGUwIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wc3IuYwpAQCAtNjYxLDggKzY2MSwxMiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9w c3JfZXhpdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJdTMyIHZhbDsK IAotCWlmICghZGV2X3ByaXYtPnBzci5hY3RpdmUpCisJaWYgKCFkZXZfcHJpdi0+cHNyLmFjdGl2 ZSkgeworCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQorCQkJV0FSTl9PTihJOTE1X1JF QUQoRURQX1BTUjJfQ1RMKSAmIEVEUF9QU1IyX0VOQUJMRSk7CisJCVdBUk5fT04oSTkxNV9SRUFE KEVEUF9QU1JfQ1RMKSAmIEVEUF9QU1JfRU5BQkxFKTsKIAkJcmV0dXJuOworCX0KIAogCWlmIChk ZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCkgewogCQl2YWwgPSBJOTE1X1JFQUQoRURQX1BTUjJf Q1RMKTsKQEAgLTY4MCwzMiArNjg0LDIzIEBAIHN0YXRpYyB2b2lkCiBpbnRlbF9wc3JfZGlzYWJs ZV9zb3VyY2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkcF90b19pOTE1KGludGVsX2RwKTsKKwlpOTE1X3JlZ190IHBz cl9zdGF0dXM7CisJdTMyIHBzcl9zdGF0dXNfbWFzazsKIAotCWlmIChkZXZfcHJpdi0+cHNyLmFj dGl2ZSkgewotCQlpOTE1X3JlZ190IHBzcl9zdGF0dXM7Ci0JCXUzMiBwc3Jfc3RhdHVzX21hc2s7 Ci0KLQkJaW50ZWxfcHNyX2V4aXQoZGV2X3ByaXYpOworCWludGVsX3Bzcl9leGl0KGRldl9wcml2 KTsKIAotCQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQpIHsKLQkJCXBzcl9zdGF0dXMg PSBFRFBfUFNSMl9TVEFUVVM7Ci0JCQlwc3Jfc3RhdHVzX21hc2sgPSBFRFBfUFNSMl9TVEFUVVNf U1RBVEVfTUFTSzsKLQkJfSBlbHNlIHsKLQkJCXBzcl9zdGF0dXMgPSBFRFBfUFNSX1NUQVRVUzsK LQkJCXBzcl9zdGF0dXNfbWFzayA9IEVEUF9QU1JfU1RBVFVTX1NUQVRFX01BU0s7Ci0JCX0KLQot CQkvKiBXYWl0IHRpbGwgUFNSIGlzIGlkbGUgKi8KLQkJaWYgKGludGVsX3dhaXRfZm9yX3JlZ2lz dGVyKGRldl9wcml2LAotCQkJCQkgICAgcHNyX3N0YXR1cywgcHNyX3N0YXR1c19tYXNrLCAwLAot CQkJCQkgICAgMjAwMCkpCi0JCQlEUk1fRVJST1IoIlRpbWVkIG91dCB3YWl0aW5nIGZvciBQU1Ig SWRsZSBTdGF0ZVxuIik7CisJaWYgKGRldl9wcml2LT5wc3IucHNyMl9lbmFibGVkKSB7CisJCXBz cl9zdGF0dXMgPSBFRFBfUFNSMl9TVEFUVVM7CisJCXBzcl9zdGF0dXNfbWFzayA9IEVEUF9QU1Iy X1NUQVRVU19TVEFURV9NQVNLOwogCX0gZWxzZSB7Ci0JCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJf ZW5hYmxlZCkKLQkJCVdBUk5fT04oSTkxNV9SRUFEKEVEUF9QU1IyX0NUTCkgJiBFRFBfUFNSMl9F TkFCTEUpOwotCQllbHNlCi0JCQlXQVJOX09OKEk5MTVfUkVBRChFRFBfUFNSX0NUTCkgJiBFRFBf UFNSX0VOQUJMRSk7CisJCXBzcl9zdGF0dXMgPSBFRFBfUFNSX1NUQVRVUzsKKwkJcHNyX3N0YXR1 c19tYXNrID0gRURQX1BTUl9TVEFUVVNfU1RBVEVfTUFTSzsKIAl9CisKKwkvKiBXYWl0IHRpbGwg UFNSIGlzIGlkbGUgKi8KKwlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoZGV2X3ByaXYsIHBz cl9zdGF0dXMsIHBzcl9zdGF0dXNfbWFzaywgMCwKKwkJCQkgICAgMjAwMCkpCisJCURSTV9FUlJP UigiVGltZWQgb3V0IHdhaXRpbmcgZm9yIFBTUiBJZGxlIFN0YXRlXG4iKTsKIH0KIAogc3RhdGlj IHZvaWQgaW50ZWxfcHNyX2Rpc2FibGVfbG9ja2VkKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAp Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=