From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v3 10/10] drm/i915: Do not enable PSR in the next modeset after a error Date: Thu, 25 Oct 2018 18:17:37 -0700 Message-ID: <20181026011737.23684-10-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 CEB056E042 for ; Fri, 26 Oct 2018 01:17:43 +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 List-Id: intel-gfx@lists.freedesktop.org V2hlbiB3ZSBkZXRlY3QgYSBlcnJvciBhbmQgZGlzYWJsZSBQU1IsIGl0IGlzIGtlcHQgZGlzYWJs ZSB1bnRpbCB0aGUKbmV4dCBtb2Rlc2V0IGJ1dCBhcyB0aGUgc2luayBhbHJlYWR5IHNob3cgc2ln bnMgdGhhdCBpdCBkbyBub3QKcHJvcGVybHkgd29yayB3aXRoIFBTUiBsZXRzIGRpc2FibGVkIGl0 IGZvciBnb29kIHRvIGF2b2lkIGFueQphZGRpdGlvbmFsIGZsaWNrZXJpbmcuCgpDYzogRGhpbmFr YXJhbiBQYW5kaXlhbiA8ZGhpbmFrYXJhbi5wYW5kaXlhbkBpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcHNyLmMgfCAxMSArKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNl cnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMmEy NTc0ZjM0YjRhLi44OTQ3OWQwZWU2YjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNjM5 LDYgKzYzOSw3IEBAIHN0cnVjdCBpOTE1X3BzciB7CiAJa3RpbWVfdCBsYXN0X2VudHJ5X2F0dGVt cHQ7CiAJa3RpbWVfdCBsYXN0X2V4aXQ7CiAJdTMyIGlycV9hdXhfZXJyb3I7CisJYm9vbCBzaW5r X25vdF9yZWxpYWJsZTsKIH07CiAKIGVudW0gaW50ZWxfcGNoIHsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cHNyLmMKaW5kZXggNzE4MjcwZGExMDYxLi40N2IzMzRiNmFmMTYgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jCkBAIC01NDIsNiArNTQyLDExIEBAIHZvaWQgaW50ZWxfcHNyX2NvbXB1dGVfY29u ZmlnKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCXJldHVybjsKIAl9CiAKKwlpZiAoZGV2 X3ByaXYtPnBzci5zaW5rX25vdF9yZWxpYWJsZSkgeworCQlEUk1fREVCVUdfS01TKCJTaW5rIG5v dCByZWxpYWJsZSBzZXRcbiIpOworCQlyZXR1cm47CisJfQorCiAJaWYgKElTX0hBU1dFTEwoZGV2 X3ByaXYpICYmCiAJICAgIEk5MTVfUkVBRChIU1dfU1RFUkVPXzNEX0NUTChjcnRjX3N0YXRlLT5j cHVfdHJhbnNjb2RlcikpICYKIAkJICAgICAgUzNEX0VOQUJMRSkgewpAQCAtOTQyLDYgKzk0Nyw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bzcl9oYW5kbGVfaXJxKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAltdXRleF9sb2NrKCZwc3ItPmxvY2spOwogCiAJaW50ZWxfcHNyX2Rp c2FibGVfbG9ja2VkKHBzci0+ZHApOworCXBzci0+c2lua19ub3RfcmVsaWFibGUgPSB0cnVlOwog CS8qIGxldCdzIG1ha2Ugc3VyZSB0aGF0IHNpbmsgaXMgYXdha2VuICovCiAJZHJtX2RwX2RwY2Rf d3JpdGViKCZwc3ItPmRwLT5hdXgsIERQX1NFVF9QT1dFUiwgRFBfU0VUX1BPV0VSX0QwKTsKIApA QCAtMTE0MSw2ICsxMTQ3LDcgQEAgdm9pZCBpbnRlbF9wc3Jfc2hvcnRfcHVsc2Uoc3RydWN0IGlu dGVsX2RwICppbnRlbF9kcCkKIAlpZiAoKHZhbCAmIERQX1BTUl9TSU5LX1NUQVRFX01BU0spID09 IERQX1BTUl9TSU5LX0lOVEVSTkFMX0VSUk9SKSB7CiAJCURSTV9ERUJVR19LTVMoIlBTUiBzaW5r IGludGVybmFsIGVycm9yLCBkaXNhYmxpbmcgUFNSXG4iKTsKIAkJaW50ZWxfcHNyX2Rpc2FibGVf bG9ja2VkKGludGVsX2RwKTsKKwkJcHNyLT5zaW5rX25vdF9yZWxpYWJsZSA9IHRydWU7CiAJfQog CiAJaWYgKGRybV9kcF9kcGNkX3JlYWRiKCZpbnRlbF9kcC0+YXV4LCBEUF9QU1JfRVJST1JfU1RB VFVTLCAmdmFsKSAhPSAxKSB7CkBAIC0xMTU4LDggKzExNjUsMTAgQEAgdm9pZCBpbnRlbF9wc3Jf c2hvcnRfcHVsc2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAlpZiAodmFsICYgfmVycm9y cykKIAkJRFJNX0VSUk9SKCJQU1JfRVJST1JfU1RBVFVTIHVuaGFuZGxlZCBlcnJvcnMgJXhcbiIs CiAJCQkgIHZhbCAmIH5lcnJvcnMpOwotCWlmICh2YWwgJiBlcnJvcnMpCisJaWYgKHZhbCAmIGVy cm9ycykgewogCQlpbnRlbF9wc3JfZGlzYWJsZV9sb2NrZWQoaW50ZWxfZHApOworCQlwc3ItPnNp bmtfbm90X3JlbGlhYmxlID0gdHJ1ZTsKKwl9CiAJLyogY2xlYXIgc3RhdHVzIHJlZ2lzdGVyICov CiAJZHJtX2RwX2RwY2Rfd3JpdGViKCZpbnRlbF9kcC0+YXV4LCBEUF9QU1JfRVJST1JfU1RBVFVT LCB2YWwpOwogZXhpdDoKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==