From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v4 2/5] drm/i915/psr: Begin to handle PSR/PSR2 errors set by sink Date: Thu, 14 Jun 2018 13:34:30 -0700 Message-ID: <20180614203433.5602-2-jose.souza@intel.com> References: <20180614203433.5602-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 036306E8F0 for ; Thu, 14 Jun 2018 20:35:43 +0000 (UTC) In-Reply-To: <20180614203433.5602-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 ZURQIHNwZWMgc3RhdGVzIHRoYXQgc2luayBkZXZpY2Ugd2lsbCBkbyBhIHNob3J0IHB1bHNlIGlu IEhQRApsaW5lIHdoZW4gdGhlcmUgaXMgYSBQU1IvUFNSMiBlcnJvciB0aGF0IG5lZWRzIHRvIGJl IGhhbmRsZWQgYnkKc291cmNlLCB0aGlzIGlzIGhhbmRsaW5nIHRoZSBmaXJzdCBhbmQgbW9zdCBz aW1wbGVzIGVycm9yOgpEUF9QU1JfU0lOS19JTlRFUk5BTF9FUlJPUi4KCkhlcmUgdGFraW5nIHRo ZSBzYWZlc3QgYXBwcm9hY2ggYW5kIGRpc2FibGluZyBQU1IoYXQgbGVhc3QgdW50aWwKdGhlIG5l eHQgbW9kZXNldCksIHRvIGF2b2lkIG11bHRpcGxlIHJlbmRlcmluZyBpc3N1ZXMgZHVlIHRvCmJh ZCBwYW5uZWxzLgoKdjQ6ClVzaW5nIENBTl9QU1IgaW5zdGVhZCBvZiBIQVNfUFNSIGluIGludGVs X3Bzcl9zaG9ydF9wdWxzZQoKdjM6CmRpc2FibGluZyBQU1IgaW5zdGVhZCBvZiBleGl0aW5nIG9u IGVycm9yCgpDYzogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhpbmFrYXJhbi5wYW5kaXlhbkBpbnRl bC5jb20+CkNjOiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+ClNpZ25lZC1v ZmYtYnk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291emFAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNy LmMgfCA2MCArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCA1MiBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwppbmRleCA2Nzg3NWIwMGM4ZGYuLjE5NTg1NTIzZTRjZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCkBAIC00NDc0LDYgKzQ0NzQsOCBAQCBpbnRlbF9kcF9zaG9ydF9wdWxzZShzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwKQogCWlmIChpbnRlbF9kcF9uZWVkc19saW5rX3JldHJhaW4oaW50ZWxf ZHApKQogCQlyZXR1cm4gZmFsc2U7CiAKKwlpbnRlbF9wc3Jfc2hvcnRfcHVsc2UoaW50ZWxfZHAp OworCiAJaWYgKGludGVsX2RwLT5jb21wbGlhbmNlLnRlc3RfdHlwZSA9PSBEUF9URVNUX0xJTktf VFJBSU5JTkcpIHsKIAkJRFJNX0RFQlVHX0tNUygiTGluayBUcmFpbmluZyBDb21wbGlhbmNlIFRl c3QgcmVxdWVzdGVkXG4iKTsKIAkJLyogU2VuZCBhIEhvdHBsdWcgVWV2ZW50IHRvIHVzZXJzcGFj ZSB0byBzdGFydCBtb2Rlc2V0ICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDg4NDAx MDg3NDlhNS4uYmI2ZmZkYjI4MmZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTky Niw2ICsxOTI2LDcgQEAgdm9pZCBpbnRlbF9wc3JfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVs X2RwICppbnRlbF9kcCwKIAkJCSAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlKTsKIHZvaWQgaW50ZWxfcHNyX2lycV9jb250cm9sKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwgYm9vbCBkZWJ1Zyk7CiB2b2lkIGludGVsX3Bzcl9pcnFfaGFuZGxlcihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBwc3JfaWlyKTsKK3ZvaWQgaW50ZWxf cHNyX3Nob3J0X3B1bHNlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApOwogCiAvKiBpbnRlbF9y dW50aW1lX3BtLmMgKi8KIGludCBpbnRlbF9wb3dlcl9kb21haW5zX2luaXQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w c3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCmluZGV4IGJjNmQ1NGY2Nzdk Yy4uYWY1ZmNmZDk4YTUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w c3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwpAQCAtNzIwLDYgKzcy MCwyMyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCkKIAlwc3JfYXV4X2lvX3Bvd2VyX3B1dChpbnRlbF9kcCk7CiB9CiAKK3N0YXRpYyB2b2lk IHBzcl9kaXNhYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCit7CisJc3RydWN0IGludGVs X2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7 CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2 OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwor CWlmICghZGV2X3ByaXYtPnBzci5lbmFibGVkKQorCQlyZXR1cm47CisKKwlkZXZfcHJpdi0+cHNy LmRpc2FibGVfc291cmNlKGludGVsX2RwKTsKKworCS8qIERpc2FibGUgUFNSIG9uIFNpbmsgKi8K Kwlkcm1fZHBfZHBjZF93cml0ZWIoJmludGVsX2RwLT5hdXgsIERQX1BTUl9FTl9DRkcsIDApOwor CisJZGV2X3ByaXYtPnBzci5lbmFibGVkID0gTlVMTDsKK30KKwogLyoqCiAgKiBpbnRlbF9wc3Jf ZGlzYWJsZSAtIERpc2FibGUgUFNSCiAgKiBAaW50ZWxfZHA6IEludGVsIERQCkBAIC03NDEsMTcg Kzc1OCw3IEBAIHZvaWQgaW50ZWxfcHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCwKIAkJcmV0dXJuOwogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBzci5sb2NrKTsKLQlpZiAo IWRldl9wcml2LT5wc3IuZW5hYmxlZCkgewotCQltdXRleF91bmxvY2soJmRldl9wcml2LT5wc3Iu bG9jayk7Ci0JCXJldHVybjsKLQl9Ci0KLQlkZXZfcHJpdi0+cHNyLmRpc2FibGVfc291cmNlKGlu dGVsX2RwKTsKLQotCS8qIERpc2FibGUgUFNSIG9uIFNpbmsgKi8KLQlkcm1fZHBfZHBjZF93cml0 ZWIoJmludGVsX2RwLT5hdXgsIERQX1BTUl9FTl9DRkcsIDApOwotCi0JZGV2X3ByaXYtPnBzci5l bmFibGVkID0gTlVMTDsKKwlwc3JfZGlzYWJsZShpbnRlbF9kcCk7CiAJbXV0ZXhfdW5sb2NrKCZk ZXZfcHJpdi0+cHNyLmxvY2spOwogfQogCkBAIC05OTIsMyArOTk5LDM0IEBAIHZvaWQgaW50ZWxf cHNyX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWRldl9wcml2LT5w c3Iuc2V0dXBfdnNjID0gaHN3X3Bzcl9zZXR1cF92c2M7CiAKIH0KKwordm9pZCBpbnRlbF9wc3Jf c2hvcnRfcHVsc2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKK3sKKwlzdHJ1Y3QgaW50ZWxf ZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsK KwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0 cnVjdCBpOTE1X3BzciAqcHNyID0gJmRldl9wcml2LT5wc3I7CisJdWludDhfdCB2YWw7CisKKwlp ZiAoIUNBTl9QU1IoZGV2X3ByaXYpIHx8ICFpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQorCQly ZXR1cm47CisKKwltdXRleF9sb2NrKCZwc3ItPmxvY2spOworCisJaWYgKHBzci0+ZW5hYmxlZCAh PSBpbnRlbF9kcCkKKwkJZ290byBleGl0OworCisJaWYgKGRybV9kcF9kcGNkX3JlYWRiKCZpbnRl bF9kcC0+YXV4LCBEUF9QU1JfU1RBVFVTLCAmdmFsKSAhPSAxKSB7CisJCURSTV9FUlJPUigiUFNS X1NUQVRVUyBkcGNkIHJlYWQgZmFpbGVkXG4iKTsKKwkJZ290byBleGl0OworCX0KKworCWlmICgo dmFsICYgRFBfUFNSX1NJTktfU1RBVEVfTUFTSykgPT0gRFBfUFNSX1NJTktfSU5URVJOQUxfRVJS T1IpIHsKKwkJRFJNX0RFQlVHX0tNUygiUFNSIHNpbmsgaW50ZXJuYWwgZXJyb3IsIGRpc2FibGlu ZyBQU1JcbiIpOworCQlwc3JfZGlzYWJsZShpbnRlbF9kcCk7CisJfQorCisJLyogVE9ETzogaGFu ZGxlIG90aGVyIFBTUi9QU1IyIGVycm9ycyAqLworZXhpdDoKKwltdXRleF91bmxvY2soJnBzci0+ bG9jayk7Cit9Ci0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=