From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v5 2/5] drm/i915/psr: Begin to handle PSR/PSR2 errors set by sink Date: Fri, 15 Jun 2018 16:03:44 -0700 Message-ID: <20180615230347.3807-2-jose.souza@intel.com> References: <20180615230347.3807-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2CE76EC0C for ; Fri, 15 Jun 2018 23:04:52 +0000 (UTC) In-Reply-To: <20180615230347.3807-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 ZCBwYW5uZWxzLgoKdjU6CmFkZGVkIGxvY2tkZXBfYXNzZXJ0IGluIHBzcl9kaXNhYmxlIGFuZCBy ZW5hbWVkIHBzcl9kaXNhYmxlKCkKdG8gaW50ZWxfcHNyX2Rpc2FibGVfbG9ja2VkKCkKCnY0OgpV c2luZyBDQU5fUFNSIGluc3RlYWQgb2YgSEFTX1BTUiBpbiBpbnRlbF9wc3Jfc2hvcnRfcHVsc2UK CnYzOgpkaXNhYmxpbmcgUFNSIGluc3RlYWQgb2YgZXhpdGluZyBvbiBlcnJvcgoKQ2M6IERoaW5h a2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50ZWwuY29tPgpDYzogUm9kcmln byBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKb3PDqSBSb2Jl cnRvIGRlIFNvdXphIDxqb3NlLnNvdXphQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIHwgNjIgKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygr KSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggNmFjNmM4Nzg3 ZGNmLi43YzViNmVjNWQ3YmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtNDQ5OSw2ICs0 NDk5LDggQEAgaW50ZWxfZHBfc2hvcnRfcHVsc2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkK IAlpZiAoaW50ZWxfZHBfbmVlZHNfbGlua19yZXRyYWluKGludGVsX2RwKSkKIAkJcmV0dXJuIGZh bHNlOwogCisJaW50ZWxfcHNyX3Nob3J0X3B1bHNlKGludGVsX2RwKTsKKwogCWlmIChpbnRlbF9k cC0+Y29tcGxpYW5jZS50ZXN0X3R5cGUgPT0gRFBfVEVTVF9MSU5LX1RSQUlOSU5HKSB7CiAJCURS TV9ERUJVR19LTVMoIkxpbmsgVHJhaW5pbmcgQ29tcGxpYW5jZSBUZXN0IHJlcXVlc3RlZFxuIik7 CiAJCS8qIFNlbmQgYSBIb3RwbHVnIFVldmVudCB0byB1c2Vyc3BhY2UgdG8gc3RhcnQgbW9kZXNl dCAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAwNGQ2MTg5N2IwNDQuLjZiY2Y4ZTkx MDAxNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE5MjcsNiArMTkyNyw3IEBAIHZv aWQgaW50ZWxfcHNyX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJ CQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiB2b2lkIGludGVs X3Bzcl9pcnFfY29udHJvbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGJvb2wg ZGVidWcpOwogdm9pZCBpbnRlbF9wc3JfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCB1MzIgcHNyX2lpcik7Cit2b2lkIGludGVsX3Bzcl9zaG9ydF9wdWxzZShz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKTsKIAogLyogaW50ZWxfcnVudGltZV9wbS5jICovCiBp bnQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICopOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCBiYzZkNTRmNjc3ZGMuLjc2ODkzMWZhNjM0ZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTcyMCw2ICs3MjAsMjUgQEAgc3RhdGljIHZv aWQgaHN3X3Bzcl9kaXNhYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJcHNyX2F1eF9p b19wb3dlcl9wdXQoaW50ZWxfZHApOwogfQogCitzdGF0aWMgdm9pZCBpbnRlbF9wc3JfZGlzYWJs ZV9sb2NrZWQoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKK3sKKwlzdHJ1Y3QgaW50ZWxfZGln aXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKKwlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CisJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCisJbG9j a2RlcF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYtPnBzci5sb2NrKTsKKworCWlmICghZGV2X3ByaXYt PnBzci5lbmFibGVkKQorCQlyZXR1cm47CisKKwlkZXZfcHJpdi0+cHNyLmRpc2FibGVfc291cmNl KGludGVsX2RwKTsKKworCS8qIERpc2FibGUgUFNSIG9uIFNpbmsgKi8KKwlkcm1fZHBfZHBjZF93 cml0ZWIoJmludGVsX2RwLT5hdXgsIERQX1BTUl9FTl9DRkcsIDApOworCisJZGV2X3ByaXYtPnBz ci5lbmFibGVkID0gTlVMTDsKK30KKwogLyoqCiAgKiBpbnRlbF9wc3JfZGlzYWJsZSAtIERpc2Fi bGUgUFNSCiAgKiBAaW50ZWxfZHA6IEludGVsIERQCkBAIC03NDEsMTcgKzc2MCw3IEBAIHZvaWQg aW50ZWxfcHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJcmV0dXJuOwog CiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBzci5sb2NrKTsKLQlpZiAoIWRldl9wcml2LT5wc3Iu ZW5hYmxlZCkgewotCQltdXRleF91bmxvY2soJmRldl9wcml2LT5wc3IubG9jayk7Ci0JCXJldHVy bjsKLQl9Ci0KLQlkZXZfcHJpdi0+cHNyLmRpc2FibGVfc291cmNlKGludGVsX2RwKTsKLQotCS8q IERpc2FibGUgUFNSIG9uIFNpbmsgKi8KLQlkcm1fZHBfZHBjZF93cml0ZWIoJmludGVsX2RwLT5h dXgsIERQX1BTUl9FTl9DRkcsIDApOwotCi0JZGV2X3ByaXYtPnBzci5lbmFibGVkID0gTlVMTDsK KwlpbnRlbF9wc3JfZGlzYWJsZV9sb2NrZWQoaW50ZWxfZHApOwogCW11dGV4X3VubG9jaygmZGV2 X3ByaXYtPnBzci5sb2NrKTsKIH0KIApAQCAtOTkyLDMgKzEwMDEsMzQgQEAgdm9pZCBpbnRlbF9w c3JfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZGV2X3ByaXYtPnBz ci5zZXR1cF92c2MgPSBoc3dfcHNyX3NldHVwX3ZzYzsKIAogfQorCit2b2lkIGludGVsX3Bzcl9z aG9ydF9wdWxzZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQoreworCXN0cnVjdCBpbnRlbF9k aWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOwor CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldjsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3Ry dWN0IGk5MTVfcHNyICpwc3IgPSAmZGV2X3ByaXYtPnBzcjsKKwl1OCB2YWw7CisKKwlpZiAoIUNB Tl9QU1IoZGV2X3ByaXYpIHx8ICFpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQorCQlyZXR1cm47 CisKKwltdXRleF9sb2NrKCZwc3ItPmxvY2spOworCisJaWYgKHBzci0+ZW5hYmxlZCAhPSBpbnRl bF9kcCkKKwkJZ290byBleGl0OworCisJaWYgKGRybV9kcF9kcGNkX3JlYWRiKCZpbnRlbF9kcC0+ YXV4LCBEUF9QU1JfU1RBVFVTLCAmdmFsKSAhPSAxKSB7CisJCURSTV9FUlJPUigiUFNSX1NUQVRV UyBkcGNkIHJlYWQgZmFpbGVkXG4iKTsKKwkJZ290byBleGl0OworCX0KKworCWlmICgodmFsICYg RFBfUFNSX1NJTktfU1RBVEVfTUFTSykgPT0gRFBfUFNSX1NJTktfSU5URVJOQUxfRVJST1IpIHsK KwkJRFJNX0RFQlVHX0tNUygiUFNSIHNpbmsgaW50ZXJuYWwgZXJyb3IsIGRpc2FibGluZyBQU1Jc biIpOworCQlpbnRlbF9wc3JfZGlzYWJsZV9sb2NrZWQoaW50ZWxfZHApOworCX0KKworCS8qIFRP RE86IGhhbmRsZSBvdGhlciBQU1IvUFNSMiBlcnJvcnMgKi8KK2V4aXQ6CisJbXV0ZXhfdW5sb2Nr KCZwc3ItPmxvY2spOworfQotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK