From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v7 2/5] drm/i915/psr: Begin to handle PSR/PSR2 errors set by sink Date: Tue, 26 Jun 2018 13:16:41 -0700 Message-ID: <20180626201644.21932-2-jose.souza@intel.com> References: <20180626201644.21932-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id CE2626E653 for ; Tue, 26 Jun 2018 20:18:00 +0000 (UTC) In-Reply-To: <20180626201644.21932-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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org ZURQIHNwZWMgc3RhdGVzIHRoYXQgc2luayBkZXZpY2Ugd2lsbCBkbyBhIHNob3J0IHB1bHNlIGlu IEhQRApsaW5lIHdoZW4gdGhlcmUgaXMgYSBQU1IvUFNSMiBlcnJvciB0aGF0IG5lZWRzIHRvIGJl IGhhbmRsZWQgYnkKc291cmNlLCB0aGlzIGlzIGhhbmRsaW5nIHRoZSBmaXJzdCBhbmQgbW9zdCBz aW1wbGVzIGVycm9yOgpEUF9QU1JfU0lOS19JTlRFUk5BTF9FUlJPUi4KCkhlcmUgdGFraW5nIHRo ZSBzYWZlc3QgYXBwcm9hY2ggYW5kIGRpc2FibGluZyBQU1IoYXQgbGVhc3QgdW50aWwKdGhlIG5l eHQgbW9kZXNldCksIHRvIGF2b2lkIG11bHRpcGxlIHJlbmRlcmluZyBpc3N1ZXMgZHVlIHRvCmJh ZCBwYW5uZWxzLgoKdjU6CmFkZGVkIGxvY2tkZXBfYXNzZXJ0IGluIHBzcl9kaXNhYmxlIGFuZCBy ZW5hbWVkIHBzcl9kaXNhYmxlKCkKdG8gaW50ZWxfcHNyX2Rpc2FibGVfbG9ja2VkKCkKCnY0OgpV c2luZyBDQU5fUFNSIGluc3RlYWQgb2YgSEFTX1BTUiBpbiBpbnRlbF9wc3Jfc2hvcnRfcHVsc2UK CnYzOgpkaXNhYmxpbmcgUFNSIGluc3RlYWQgb2YgZXhpdGluZyBvbiBlcnJvcgoKUmV2aWV3ZWQt Ynk6IERoaW5ha2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50ZWwuY29tPgpD YzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBK b3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIHwgNjIg KysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNTQgaW5z ZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXgg YzFiMmYwMGYzMjRiLi41YmUwN2UxZDgxNmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAt NDQ5MSw2ICs0NDkxLDggQEAgaW50ZWxfZHBfc2hvcnRfcHVsc2Uoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCkKIAlpZiAoaW50ZWxfZHBfbmVlZHNfbGlua19yZXRyYWluKGludGVsX2RwKSkKIAkJ cmV0dXJuIGZhbHNlOwogCisJaW50ZWxfcHNyX3Nob3J0X3B1bHNlKGludGVsX2RwKTsKKwogCWlm IChpbnRlbF9kcC0+Y29tcGxpYW5jZS50ZXN0X3R5cGUgPT0gRFBfVEVTVF9MSU5LX1RSQUlOSU5H KSB7CiAJCURSTV9ERUJVR19LTVMoIkxpbmsgVHJhaW5pbmcgQ29tcGxpYW5jZSBUZXN0IHJlcXVl c3RlZFxuIik7CiAJCS8qIFNlbmQgYSBIb3RwbHVnIFVldmVudCB0byB1c2Vyc3BhY2UgdG8gc3Rh cnQgbW9kZXNldCAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA4NDI5NmJkYWE3ZDgu LmE2ZmYyNjAwYTNhMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE5MjEsNiArMTky MSw3IEBAIHZvaWQgaW50ZWxfcHNyX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAsCiAJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiB2 b2lkIGludGVsX3Bzcl9pcnFfY29udHJvbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIGJvb2wgZGVidWcpOwogdm9pZCBpbnRlbF9wc3JfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgcHNyX2lpcik7Cit2b2lkIGludGVsX3Bzcl9zaG9y dF9wdWxzZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKTsKIAogLyogaW50ZWxfcnVudGltZV9w bS5jICovCiBpbnQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCBmNmQzODRhMTFiNzkuLjQ0NWU5 N2RjNzkxZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTY2Niw2ICs2NjYsMjUgQEAg aW50ZWxfcHNyX2Rpc2FibGVfc291cmNlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJfQog fQogCitzdGF0aWMgdm9pZCBpbnRlbF9wc3JfZGlzYWJsZV9sb2NrZWQoc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCkKK3sKKwlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9y dCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g aW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2X3By aXYtPnBzci5sb2NrKTsKKworCWlmICghZGV2X3ByaXYtPnBzci5lbmFibGVkKQorCQlyZXR1cm47 CisKKwlpbnRlbF9wc3JfZGlzYWJsZV9zb3VyY2UoaW50ZWxfZHApOworCisJLyogRGlzYWJsZSBQ U1Igb24gU2luayAqLworCWRybV9kcF9kcGNkX3dyaXRlYigmaW50ZWxfZHAtPmF1eCwgRFBfUFNS X0VOX0NGRywgMCk7CisKKwlkZXZfcHJpdi0+cHNyLmVuYWJsZWQgPSBOVUxMOworfQorCiAvKioK ICAqIGludGVsX3Bzcl9kaXNhYmxlIC0gRGlzYWJsZSBQU1IKICAqIEBpbnRlbF9kcDogSW50ZWwg RFAKQEAgLTY4NywxNyArNzA2LDcgQEAgdm9pZCBpbnRlbF9wc3JfZGlzYWJsZShzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwLAogCQlyZXR1cm47CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+cHNy LmxvY2spOwotCWlmICghZGV2X3ByaXYtPnBzci5lbmFibGVkKSB7Ci0JCW11dGV4X3VubG9jaygm ZGV2X3ByaXYtPnBzci5sb2NrKTsKLQkJcmV0dXJuOwotCX0KLQotCWludGVsX3Bzcl9kaXNhYmxl X3NvdXJjZShpbnRlbF9kcCk7Ci0KLQkvKiBEaXNhYmxlIFBTUiBvbiBTaW5rICovCi0JZHJtX2Rw X2RwY2Rfd3JpdGViKCZpbnRlbF9kcC0+YXV4LCBEUF9QU1JfRU5fQ0ZHLCAwKTsKLQotCWRldl9w cml2LT5wc3IuZW5hYmxlZCA9IE5VTEw7CisJaW50ZWxfcHNyX2Rpc2FibGVfbG9ja2VkKGludGVs X2RwKTsKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5wc3IubG9jayk7CiAJY2FuY2VsX3dvcmtf c3luYygmZGV2X3ByaXYtPnBzci53b3JrKTsKIH0KQEAgLTkzMiwzICs5NDEsMzQgQEAgdm9pZCBp bnRlbF9wc3JfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJSU5JVF9X T1JLKCZkZXZfcHJpdi0+cHNyLndvcmssIGludGVsX3Bzcl93b3JrKTsKIAltdXRleF9pbml0KCZk ZXZfcHJpdi0+cHNyLmxvY2spOwogfQorCit2b2lkIGludGVsX3Bzcl9zaG9ydF9wdWxzZShzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwKQoreworCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmlu dGVsX2RpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOworCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGk5MTVfcHNyICpw c3IgPSAmZGV2X3ByaXYtPnBzcjsKKwl1OCB2YWw7CisKKwlpZiAoIUNBTl9QU1IoZGV2X3ByaXYp IHx8ICFpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQorCQlyZXR1cm47CisKKwltdXRleF9sb2Nr KCZwc3ItPmxvY2spOworCisJaWYgKHBzci0+ZW5hYmxlZCAhPSBpbnRlbF9kcCkKKwkJZ290byBl eGl0OworCisJaWYgKGRybV9kcF9kcGNkX3JlYWRiKCZpbnRlbF9kcC0+YXV4LCBEUF9QU1JfU1RB VFVTLCAmdmFsKSAhPSAxKSB7CisJCURSTV9FUlJPUigiUFNSX1NUQVRVUyBkcGNkIHJlYWQgZmFp bGVkXG4iKTsKKwkJZ290byBleGl0OworCX0KKworCWlmICgodmFsICYgRFBfUFNSX1NJTktfU1RB VEVfTUFTSykgPT0gRFBfUFNSX1NJTktfSU5URVJOQUxfRVJST1IpIHsKKwkJRFJNX0RFQlVHX0tN UygiUFNSIHNpbmsgaW50ZXJuYWwgZXJyb3IsIGRpc2FibGluZyBQU1JcbiIpOworCQlpbnRlbF9w c3JfZGlzYWJsZV9sb2NrZWQoaW50ZWxfZHApOworCX0KKworCS8qIFRPRE86IGhhbmRsZSBvdGhl ciBQU1IvUFNSMiBlcnJvcnMgKi8KK2V4aXQ6CisJbXV0ZXhfdW5sb2NrKCZwc3ItPmxvY2spOwor fQotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK