From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 3/6] drm/i915: Exit PSR before do a aux transaction in gen < 9 Date: Fri, 23 Feb 2018 18:03:08 -0800 Message-ID: <20180224020311.14813-3-jose.souza@intel.com> References: <20180224020311.14813-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0F8C6F39B for ; Sat, 24 Feb 2018 02:04:55 +0000 (UTC) In-Reply-To: <20180224020311.14813-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@intel.com List-Id: intel-gfx@lists.freedesktop.org QXMgZ2VuIDwgOSBoYXJkd2FyZSBkb24ndCBoYXZlIHRoZSBhdXggY2ggbXV0ZXgsIHdlIG5lZWQg dG8gZXhpdCBQU1IKYW5kIHdhaXQgdW50aWwgaXQgaXMgYmFjayB0byBpbmFjdGl2ZSBzdGF0ZSBi ZWZvcmUgZG8gYW55IGF1eCBjaAp0cmFuc2FjdGlvbi4KClNpZ25lZC1vZmYtYnk6IEpvc8OpIFJv YmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwLmMgIHwgIDggKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oIHwgIDkgKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3Iu YyB8IDQyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIDMgZmlsZXMg Y2hhbmdlZCwgNTIgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHAuYwppbmRleCA3YmUyZmVjNTE2NTEuLmRhY2RkOThiYmIyZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcC5jCkBAIC0xMDg4LDggKzEwODgsMTQgQEAgc3RhdGljIGJvb2wgaW50ZWxfZHBfYXV4 X2NoX3RyeWxvY2soc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJCXRvX2k5MTUoaW50ZWxf ZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXYpOwogCWk5MTVfcmVnX3QgY2hfbXV0ZXg7CiAKLQlpZiAo IWludGVsX2RwLT5hdXhfY2hfbXV0ZXhfcmVnKQorCWlmICghaW50ZWxfZHAtPmF1eF9jaF9tdXRl eF9yZWcpIHsKKwkJLyogQXMgZ2VuIDwgOSBoYXJkd2FyZSBkb24ndCBoYXZlIHRoZSBhdXggY2gg bXV0ZXgsIHdlIG5lZWQgdG8KKwkJICogZXhpdCBQU1IgYW5kIHdhaXQgdW50aWwgaXQgaXMgYmFj ayB0byBpbmFjdGl2ZSBzdGF0ZSBiZWZvcmUKKwkJICogZG8gYW55IGF1eCBjaCB0cmFuc2FjdGlv bgorCQkgKi8KKwkJaW50ZWxfcHNyX2V4aXQoaW50ZWxfZHAsIHRydWUpOwogCQlyZXR1cm4gdHJ1 ZTsKKwl9CiAKIAljaF9tdXRleCA9IGludGVsX2RwLT5hdXhfY2hfbXV0ZXhfcmVnKGludGVsX2Rw KTsKIAlJOTE1X1dSSVRFKGNoX211dGV4LCBEUF9BVVhfQ0hfTVVURVhfRU5BQkxFKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMjY3Y2M2YzVhODlmLi43YWRjZDU5NTVkMWIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xODgxLDYgKzE4ODEsMTUgQEAgdm9pZCBpbnRlbF9w c3Jfc2luZ2xlX2ZyYW1lX3VwZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJCQkJICAgdW5zaWduZWQgZnJvbnRidWZmZXJfYml0cyk7CiB2b2lkIGludGVsX3Bzcl9jb21w dXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQkJICAgICAgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOworLyoqCisgKiBFeGl0IFBTUiBpbiB0aGUgZ2l2 ZW4gRGlzcGxheVBvcnQuCisgKiBAaW50ZWxfZHA6IERpc3BsYXlQb3J0IHdoaWNoIFBTUiBzaG91 bGQgYmUgZXhpdCBpZiBydW5uaW5nCisgKiBAd2FpdF9leGl0OiBpZiB0cnVlIGl0IHdpbGwgd2Fp dCB1bnRpbCBQU1IgaGF2ZSBjaGFuZ2VkIHRvIGluYWN0aXZlIHN0YXRlLAorICogb3RoZXJ3aXNl IHRoZXJlIGlzIG5vdCB3YWl0LgorICoKKyAqIEl0IHdpbGwgYWxzbyBzY2hlZHVsZSBhIHdvcmsg dG8gdHJ5IHRvIGFjdGl2ZSBQU1IgYWdhaW4uCisgKi8KK3ZvaWQgaW50ZWxfcHNyX2V4aXQoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCwgYm9vbCB3YWl0X2V4aXQpOwogCiAvKiBpbnRlbF9ydW50 aW1lX3BtLmMgKi8KIGludCBpbnRlbF9wb3dlcl9kb21haW5zX2luaXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3Iu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCmluZGV4IGU4YzMyYzNhZmIwZS4u MGI4ODljODVlOGRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3Iu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwpAQCAtNTYsNiArNTYsOCBA QAogI2luY2x1ZGUgImludGVsX2Rydi5oIgogI2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAKKyNkZWZp bmUgUFNSX0FDVElWRV9ERUxBWV9NU0VDIDEwMAorCiBzdGF0aWMgYm9vbCB2bHZfaXNfcHNyX2Fj dGl2ZV9vbl9waXBlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlKQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKQEAgLTQ4Niw2ICs0 ODgsMTYgQEAgc3RhdGljIHZvaWQgaHN3X3Bzcl9lbmFibGVfc291cmNlKHN0cnVjdCBpbnRlbF9k cCAqaW50ZWxfZHAsCiAJfQogfQogCitzdGF0aWMgdm9pZCBpbnRlbF9wc3JfYWN0aXZlX3NjaGVk dWxlKHN0cnVjdCBpOTE1X3BzciAqcHNyLAorCQkJCSAgICAgIHVuc2lnbmVkIGludCBtc2VjX2Rl bGF5KQoreworCWlmIChwc3ItPmFjdGl2ZSB8fCBwc3ItPmJ1c3lfZnJvbnRidWZmZXJfYml0cykK KwkJcmV0dXJuOworCisJaWYgKCF3b3JrX2J1c3koJnBzci0+d29yay53b3JrKSkKKwkJc2NoZWR1 bGVfZGVsYXllZF93b3JrKCZwc3ItPndvcmssIG1zZWNzX3RvX2ppZmZpZXMobXNlY19kZWxheSkp OworfQorCiAvKioKICAqIGludGVsX3Bzcl9lbmFibGUgLSBFbmFibGUgUFNSCiAgKiBAaW50ZWxf ZHA6IEludGVsIERQCkBAIC01MzQsOCArNTQ2LDkgQEAgdm9pZCBpbnRlbF9wc3JfZW5hYmxlKHN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCSAqICAgICAtIE9uIEhTVy9CRFcgd2UgZ2V0IGEg cmVjb3ZlcmFibGUgZnJvemVuIHNjcmVlbiB1bnRpbAogCQkgKiAgICAgICBuZXh0IGV4aXQtYWN0 aXZhdGUgc2VxdWVuY2UuCiAJCSAqLwotCQlzY2hlZHVsZV9kZWxheWVkX3dvcmsoJmRldl9wcml2 LT5wc3Iud29yaywKLQkJCQkgICAgICBtc2Vjc190b19qaWZmaWVzKGludGVsX2RwLT5wYW5lbF9w b3dlcl9jeWNsZV9kZWxheSAqIDUpKTsKKwkJaW50ZWxfcHNyX2FjdGl2ZV9zY2hlZHVsZSgmZGV2 X3ByaXYtPnBzciwKKwkJCQkJICBpbnRlbF9kcC0+cGFuZWxfcG93ZXJfY3ljbGVfZGVsYXkKKwkJ CQkJICAqIDUpOwogCX0KIAogdW5sb2NrOgpAQCAtODg2LDEwICs4OTksNyBAQCB2b2lkIGludGVs X3Bzcl9mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaWYgKGZyb250 YnVmZmVyX2JpdHMpCiAJCWRldl9wcml2LT5wc3IuZXhpdChkZXZfcHJpdi0+cHNyLmVuYWJsZWQs IGZhbHNlKTsKIAotCWlmICghZGV2X3ByaXYtPnBzci5hY3RpdmUgJiYgIWRldl9wcml2LT5wc3Iu YnVzeV9mcm9udGJ1ZmZlcl9iaXRzKQotCQlpZiAoIXdvcmtfYnVzeSgmZGV2X3ByaXYtPnBzci53 b3JrLndvcmspKQotCQkJc2NoZWR1bGVfZGVsYXllZF93b3JrKCZkZXZfcHJpdi0+cHNyLndvcmss Ci0JCQkJCSAgICAgIG1zZWNzX3RvX2ppZmZpZXMoMTAwKSk7CisJaW50ZWxfcHNyX2FjdGl2ZV9z Y2hlZHVsZSgmZGV2X3ByaXYtPnBzciwgUFNSX0FDVElWRV9ERUxBWV9NU0VDKTsKIAltdXRleF91 bmxvY2soJmRldl9wcml2LT5wc3IubG9jayk7CiB9CiAKQEAgLTk1NSwzICs5NjUsMjMgQEAgdm9p ZCBpbnRlbF9wc3JfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWRl dl9wcml2LT5wc3IuZXhpdCA9IGhzd19wc3JfZXhpdDsKIAl9CiB9CisKK3ZvaWQgaW50ZWxfcHNy X2V4aXQoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwgYm9vbCB3YWl0X2V4aXQpCit7CisJc3Ry dWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChp bnRlbF9kcCk7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RpZ19wb3J0LT5iYXNl LmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo ZGV2KTsKKworCWlmICghSEFTX1BTUihkZXZfcHJpdikpCisJCXJldHVybjsKKworCW11dGV4X2xv Y2soJmRldl9wcml2LT5wc3IubG9jayk7CisKKwlpZiAoZGV2X3ByaXYtPnBzci5lbmFibGVkICE9 IGludGVsX2RwKQorCQlnb3RvIG91dDsKKworCWRldl9wcml2LT5wc3IuZXhpdChpbnRlbF9kcCwg d2FpdF9leGl0KTsKKwlpbnRlbF9wc3JfYWN0aXZlX3NjaGVkdWxlKCZkZXZfcHJpdi0+cHNyLCBQ U1JfQUNUSVZFX0RFTEFZX01TRUMpOworb3V0OgorCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnBz ci5sb2NrKTsKK30KLS0gCjIuMTYuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==