From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v3 08/10] drm/i915: Disable PSR when a PSR aux error happen Date: Thu, 25 Oct 2018 18:17:35 -0700 Message-ID: <20181026011737.23684-8-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 A813C6E04A 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 V2hpbGUgUFNSIGlzIGFjdGl2ZSBoYXJkd2FyZSB3aWxsIGRvIGF1eCB0cmFuc2FjdGlvbnMgYnkg aXQgc2VsZiB0bwp3YWtldXAgc2luayB0byByZWNlaXZlIGEgbmV3IGZyYW1lIHdoZW4gbmVjZXNz YXJ5LiBJZiB0aGF0CnRyYW5zYWN0aW9uIGlzIG5vdCBhY2tlZCBieSBzaW5rLCBoYXJkd2FyZSB3 aWxsIHRyaWdnZXIgdGhpcwppbnRlcnJ1cHRpb24uCgpTbyBsZXQncyBkaXNhYmxlIFBTUiBhcyBp dCBpcyBhIGhpbnQgdGhhdCB0aGVyZSBpcyBwcm9ibGVtIHdpdGggdGhpcwpzaW5rLgoKVGhlIHJl bW92ZWQgRklYTUUgd2FzIGFza2luZyB0byBtYW51YWxseSB0cmFpbiB0aGUgbGluayBidXQgd2Ug ZG9uJ3QKbmVlZCB0byBkbyB0aGF0IGFzIGJ5IHNwZWMgc2luayBzaG91bGQgZG8gYSBzaG9ydCBw dWxzZSB3aGVuIGl0IGlzCm91dCBvZiBzeW5jIHdpdGggc291cmNlLCB3ZSBqdXN0IG5lZWQgdG8g bWFrZSBzdXJlIGl0IGlzIGF3YWtlbiBhbmQKdGhlIFNEUCBoZWFkZXIgd2l0aCBQU1IgZGlzYWJs ZSB3aWxsIHRyaWdnZXIgdGhpcyBjb25kaXRpb24uCgp2MzogYWRkZWQgd29ya2Fycm91bmQgdG8g Zml4IHNjaGVkdWxlZCB3b3JrIHN0YXJ2YXRpb24gY2F1c2UgYnkKdG8gZnJlcXVlbnQgUFNSIGVy cm9yIGludGVycnVwdGlvbgoKQ2M6IERoaW5ha2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFu ZGl5YW5AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxq b3NlLnNvdXphQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIHwgNTMgKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygr KSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyZDc3NjFiOGFj MDcuLjJhMjU3NGYzNGI0YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC02MzgsNiArNjM4 LDcgQEAgc3RydWN0IGk5MTVfcHNyIHsKIAl1OCBzaW5rX3N5bmNfbGF0ZW5jeTsKIAlrdGltZV90 IGxhc3RfZW50cnlfYXR0ZW1wdDsKIAlrdGltZV90IGxhc3RfZXhpdDsKKwl1MzIgaXJxX2F1eF9l cnJvcjsKIH07CiAKIGVudW0gaW50ZWxfcGNoIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5k ZXggMDhiNTM1MWU0ZWZiLi42ODIwMWNjMjRkMjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5j CkBAIC0xNTIsNiArMTUyLDcgQEAgdm9pZCBpbnRlbF9wc3JfaXJxX2hhbmRsZXIoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgcHNyX2lpcikKIAl1MzIgdHJhbnNjb2RlcnMg PSBCSVQoVFJBTlNDT0RFUl9FRFApOwogCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlcjsK IAlrdGltZV90IHRpbWVfbnMgPSAga3RpbWVfZ2V0KCk7CisJdTMyIG1hc2sgPSAwOwogCiAJaWYg KElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkKIAkJdHJhbnNjb2RlcnMgfD0gQklUKFRSQU5TQ09E RVJfQSkgfApAQCAtMTU5LDEwICsxNjAsMjMgQEAgdm9pZCBpbnRlbF9wc3JfaXJxX2hhbmRsZXIo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgcHNyX2lpcikKIAkJCSAgICAg ICBCSVQoVFJBTlNDT0RFUl9DKTsKIAogCWZvcl9lYWNoX2NwdV90cmFuc2NvZGVyX21hc2tlZChk ZXZfcHJpdiwgY3B1X3RyYW5zY29kZXIsIHRyYW5zY29kZXJzKSB7Ci0JCS8qIEZJWE1FOiBFeGl0 IFBTUiBhbmQgbGluayB0cmFpbiBtYW51YWxseSB3aGVuIHRoaXMgaGFwcGVucy4gKi8KLQkJaWYg KHBzcl9paXIgJiBFRFBfUFNSX0VSUk9SKGNwdV90cmFuc2NvZGVyKSkKLQkJCURSTV9ERUJVR19L TVMoIlt0cmFuc2NvZGVyICVzXSBQU1IgYXV4IGVycm9yXG4iLAotCQkJCSAgICAgIHRyYW5zY29k ZXJfbmFtZShjcHVfdHJhbnNjb2RlcikpOworCQlpZiAocHNyX2lpciAmIEVEUF9QU1JfRVJST1Io Y3B1X3RyYW5zY29kZXIpKSB7CisJCQlEUk1fV0FSTigiW3RyYW5zY29kZXIgJXNdIFBTUiBhdXgg ZXJyb3JcbiIsCisJCQkJIHRyYW5zY29kZXJfbmFtZShjcHVfdHJhbnNjb2RlcikpOworCisJCQlz cGluX2xvY2soJmRldl9wcml2LT5pcnFfbG9jayk7CisJCQlkZXZfcHJpdi0+cHNyLmlycV9hdXhf ZXJyb3IgfD0gQklUKGNwdV90cmFuc2NvZGVyKTsKKwkJCXNwaW5fdW5sb2NrKCZkZXZfcHJpdi0+ aXJxX2xvY2spOworCisJCQkvKgorCQkJICogSWYgdGhpcyBpbnRlcnJ1cHRpb24gaXMgbm90IG1h c2tlZCBpdCB3aWxsIGtlZXAKKwkJCSAqIGludGVycnVwdGluZyBzbyBmYXN0IHRoYXQgaXQgcHJl dmVudHMgdGhlIHNjaGVkdWxlZAorCQkJICogd29yayB0byBydW4uCisJCQkgKiBBbHNvIGFmdGVy IGEgUFNSIGVycm9yLCB3ZSBkb24ndCB3YW50IHRvIGFybSBQU1IKKwkJCSAqIGFnYWluIHNvIHdl IGRvbid0IGNhcmUgYWJvdXQgdW5tYXNrIHRoZSBpbnRlcnJ1cHRpb24uCisJCQkgKi8KKwkJCW1h c2sgfD0gRURQX1BTUl9FUlJPUihjcHVfdHJhbnNjb2Rlcik7CisJCX0KIAogCQlpZiAocHNyX2lp ciAmIEVEUF9QU1JfUFJFX0VOVFJZKGNwdV90cmFuc2NvZGVyKSkgewogCQkJZGV2X3ByaXYtPnBz ci5sYXN0X2VudHJ5X2F0dGVtcHQgPSB0aW1lX25zOwpAQCAtMTg0LDYgKzE5OCwxMyBAQCB2b2lk IGludGVsX3Bzcl9pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs IHUzMiBwc3JfaWlyKQogCQkJfQogCQl9CiAJfQorCisJaWYgKG1hc2spIHsKKwkJbWFzayB8PSBJ OTE1X1JFQUQoRURQX1BTUl9JTVIpOworCQlJOTE1X1dSSVRFKEVEUF9QU1JfSU1SLCBtYXNrKTsK KworCQlzY2hlZHVsZV93b3JrKCZkZXZfcHJpdi0+cHNyLndvcmspOworCX0KIH0KIAogc3RhdGlj IGJvb2wgaW50ZWxfZHBfZ2V0X2NvbG9yaW1ldHJ5X3N0YXR1cyhzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwKQpAQCAtODkzLDExICs5MTQsMzUgQEAgaW50IGludGVsX3Bzcl9zZXRfZGVidWdmc19t b2RlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gcmV0OwogfQog CitzdGF0aWMgdm9pZCBpbnRlbF9wc3JfaGFuZGxlX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGk5MTVfcHNyICpwc3IgPSAmZGV2X3ByaXYtPnBzcjsK Kwl1MzIgaXJxX2F1eF9lcnJvcjsKKworCXNwaW5fbG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9j ayk7CisJaXJxX2F1eF9lcnJvciA9IHBzci0+aXJxX2F1eF9lcnJvcjsKKwlwc3ItPmlycV9hdXhf ZXJyb3IgPSAwOworCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKKworCVdB Uk5fT04oaXJxX2F1eF9lcnJvciAmIH5CSVQoVFJBTlNDT0RFUl9FRFApKTsKKworCW11dGV4X2xv Y2soJnBzci0+bG9jayk7CisKKwlpbnRlbF9wc3JfZGlzYWJsZV9sb2NrZWQocHNyLT5kcCk7CisJ LyogbGV0J3MgbWFrZSBzdXJlIHRoYXQgc2luayBpcyBhd2FrZW4gKi8KKwlkcm1fZHBfZHBjZF93 cml0ZWIoJnBzci0+ZHAtPmF1eCwgRFBfU0VUX1BPV0VSLCBEUF9TRVRfUE9XRVJfRDApOworCisJ bXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cHNyLmxvY2spOworfQorCiBzdGF0aWMgdm9pZCBpbnRl bF9wc3Jfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0KIAkJY29udGFpbmVyX29mKHdvcmssIHR5cGVvZigqZGV2X3By aXYpLCBwc3Iud29yayk7CiAKKwlpZiAoUkVBRF9PTkNFKGRldl9wcml2LT5wc3IuaXJxX2F1eF9l cnJvcikpCisJCWludGVsX3Bzcl9oYW5kbGVfaXJxKGRldl9wcml2KTsKKwogCW11dGV4X2xvY2so JmRldl9wcml2LT5wc3IubG9jayk7CiAKIAlpZiAoIWRldl9wcml2LT5wc3IuZW5hYmxlZCkKLS0g CjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==