From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v3 02/10] drm/i915/psr: Always wait for idle state when disabling PSR Date: Thu, 25 Oct 2018 18:17:29 -0700 Message-ID: <20181026011737.23684-2-jose.souza@intel.com> References: <20181026011737.23684-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB6FA6E04A for ; Fri, 26 Oct 2018 01:17:42 +0000 (UTC) In-Reply-To: <20181026011737.23684-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+ClJldmlld2VkLWJ5OiBEaGluYWthcmFuIFBhbmRp eWFuIDxkaGluYWthcmFuLnBhbmRpeWFuQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSm9zw6kg Um9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcHNyLmMgfCA0MSArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggZjY5OGIzZjQ1YzZkLi40YzIyNmI3OGMzZmMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC02NjEsOCArNjYxLDEyIEBAIHN0YXRpYyB2b2lk IGludGVsX3Bzcl9leGl0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAl1 MzIgdmFsOwogCi0JaWYgKCFkZXZfcHJpdi0+cHNyLmFjdGl2ZSkKKwlpZiAoIWRldl9wcml2LT5w c3IuYWN0aXZlKSB7CisJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJCQlXQVJOX09O KEk5MTVfUkVBRChFRFBfUFNSMl9DVEwpICYgRURQX1BTUjJfRU5BQkxFKTsKKwkJV0FSTl9PTihJ OTE1X1JFQUQoRURQX1BTUl9DVEwpICYgRURQX1BTUl9FTkFCTEUpOwogCQlyZXR1cm47CisJfQog CiAJaWYgKGRldl9wcml2LT5wc3IucHNyMl9lbmFibGVkKSB7CiAJCXZhbCA9IEk5MTVfUkVBRChF RFBfUFNSMl9DVEwpOwpAQCAtNjgwLDMyICs2ODQsMjMgQEAgc3RhdGljIHZvaWQKIGludGVsX3Bz cl9kaXNhYmxlX3NvdXJjZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogewogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRwX3RvX2k5MTUoaW50ZWxfZHApOworCWk5MTVf cmVnX3QgcHNyX3N0YXR1czsKKwl1MzIgcHNyX3N0YXR1c19tYXNrOwogCi0JaWYgKGRldl9wcml2 LT5wc3IuYWN0aXZlKSB7Ci0JCWk5MTVfcmVnX3QgcHNyX3N0YXR1czsKLQkJdTMyIHBzcl9zdGF0 dXNfbWFzazsKLQotCQlpbnRlbF9wc3JfZXhpdChkZXZfcHJpdik7CisJaW50ZWxfcHNyX2V4aXQo ZGV2X3ByaXYpOwogCi0JCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCkgewotCQkJcHNy X3N0YXR1cyA9IEVEUF9QU1IyX1NUQVRVUzsKLQkJCXBzcl9zdGF0dXNfbWFzayA9IEVEUF9QU1Iy X1NUQVRVU19TVEFURV9NQVNLOwotCQl9IGVsc2UgewotCQkJcHNyX3N0YXR1cyA9IEVEUF9QU1Jf U1RBVFVTOwotCQkJcHNyX3N0YXR1c19tYXNrID0gRURQX1BTUl9TVEFUVVNfU1RBVEVfTUFTSzsK LQkJfQotCi0JCS8qIFdhaXQgdGlsbCBQU1IgaXMgaWRsZSAqLwotCQlpZiAoaW50ZWxfd2FpdF9m b3JfcmVnaXN0ZXIoZGV2X3ByaXYsCi0JCQkJCSAgICBwc3Jfc3RhdHVzLCBwc3Jfc3RhdHVzX21h c2ssIDAsCi0JCQkJCSAgICAyMDAwKSkKLQkJCURSTV9FUlJPUigiVGltZWQgb3V0IHdhaXRpbmcg Zm9yIFBTUiBJZGxlIFN0YXRlXG4iKTsKKwlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQp IHsKKwkJcHNyX3N0YXR1cyA9IEVEUF9QU1IyX1NUQVRVUzsKKwkJcHNyX3N0YXR1c19tYXNrID0g RURQX1BTUjJfU1RBVFVTX1NUQVRFX01BU0s7CiAJfSBlbHNlIHsKLQkJaWYgKGRldl9wcml2LT5w c3IucHNyMl9lbmFibGVkKQotCQkJV0FSTl9PTihJOTE1X1JFQUQoRURQX1BTUjJfQ1RMKSAmIEVE UF9QU1IyX0VOQUJMRSk7Ci0JCWVsc2UKLQkJCVdBUk5fT04oSTkxNV9SRUFEKEVEUF9QU1JfQ1RM KSAmIEVEUF9QU1JfRU5BQkxFKTsKKwkJcHNyX3N0YXR1cyA9IEVEUF9QU1JfU1RBVFVTOworCQlw c3Jfc3RhdHVzX21hc2sgPSBFRFBfUFNSX1NUQVRVU19TVEFURV9NQVNLOwogCX0KKworCS8qIFdh aXQgdGlsbCBQU1IgaXMgaWRsZSAqLworCWlmIChpbnRlbF93YWl0X2Zvcl9yZWdpc3RlcihkZXZf cHJpdiwgcHNyX3N0YXR1cywgcHNyX3N0YXR1c19tYXNrLCAwLAorCQkJCSAgICAyMDAwKSkKKwkJ RFJNX0VSUk9SKCJUaW1lZCBvdXQgd2FpdGluZyBQU1IgaWRsZSBzdGF0ZVxuIik7CiB9CiAKIHN0 YXRpYyB2b2lkIGludGVsX3Bzcl9kaXNhYmxlX2xvY2tlZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK