From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <jose.souza@intel.com>
Subject: [PATCH v6 2/5] drm/i915/psr: Begin to handle PSR/PSR2
 errors set by sink
Date: Thu, 21 Jun 2018 14:39:43 -0700
Message-ID: <20180621213946.22870-2-jose.souza@intel.com>
References: <20180621213946.22870-1-jose.souza@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 0CF526E7CD
 for <intel-gfx@lists.freedesktop.org>; Thu, 21 Jun 2018 21:40:57 +0000 (UTC)
In-Reply-To: <20180621213946.22870-1-jose.souza@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
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
LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA1NzgzNDZiOGQ3ZTIu
LjlkNmEzYjA4MWQ3YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTE5MjAsNiArMTky
MCw3IEBAIHZvaWQgaW50ZWxfcHNyX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9kcCAqaW50
ZWxfZHAsCiAJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiB2
b2lkIGludGVsX3Bzcl9pcnFfY29udHJvbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By
aXYsIGJvb2wgZGVidWcpOwogdm9pZCBpbnRlbF9wc3JfaXJxX2hhbmRsZXIoc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgcHNyX2lpcik7Cit2b2lkIGludGVsX3Bzcl9zaG9y
dF9wdWxzZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKTsKIAogLyogaW50ZWxfcnVudGltZV9w
bS5jICovCiBpbnQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2
YXRlICopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCAwMTQ4ZDkxNWI0NzYuLjQ1OGU1
MzA1ZmQwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTcyMCw2ICs3MjAsMjUgQEAg
c3RhdGljIHZvaWQgaHN3X3Bzcl9kaXNhYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJ
cHNyX2F1eF9pb19wb3dlcl9wdXQoaW50ZWxfZHApOwogfQogCitzdGF0aWMgdm9pZCBpbnRlbF9w
c3JfZGlzYWJsZV9sb2NrZWQoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKK3sKKwlzdHJ1Y3Qg
aW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVs
X2RwKTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFz
ZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp
OworCisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2X3ByaXYtPnBzci5sb2NrKTsKKworCWlmICgh
ZGV2X3ByaXYtPnBzci5lbmFibGVkKQorCQlyZXR1cm47CisKKwlkZXZfcHJpdi0+cHNyLmRpc2Fi
bGVfc291cmNlKGludGVsX2RwKTsKKworCS8qIERpc2FibGUgUFNSIG9uIFNpbmsgKi8KKwlkcm1f
ZHBfZHBjZF93cml0ZWIoJmludGVsX2RwLT5hdXgsIERQX1BTUl9FTl9DRkcsIDApOworCisJZGV2
X3ByaXYtPnBzci5lbmFibGVkID0gTlVMTDsKK30KKwogLyoqCiAgKiBpbnRlbF9wc3JfZGlzYWJs
ZSAtIERpc2FibGUgUFNSCiAgKiBAaW50ZWxfZHA6IEludGVsIERQCkBAIC03NDEsMTcgKzc2MCw3
IEBAIHZvaWQgaW50ZWxfcHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJ
cmV0dXJuOwogCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBzci5sb2NrKTsKLQlpZiAoIWRldl9w
cml2LT5wc3IuZW5hYmxlZCkgewotCQltdXRleF91bmxvY2soJmRldl9wcml2LT5wc3IubG9jayk7
Ci0JCXJldHVybjsKLQl9Ci0KLQlkZXZfcHJpdi0+cHNyLmRpc2FibGVfc291cmNlKGludGVsX2Rw
KTsKLQotCS8qIERpc2FibGUgUFNSIG9uIFNpbmsgKi8KLQlkcm1fZHBfZHBjZF93cml0ZWIoJmlu
dGVsX2RwLT5hdXgsIERQX1BTUl9FTl9DRkcsIDApOwotCi0JZGV2X3ByaXYtPnBzci5lbmFibGVk
ID0gTlVMTDsKKwlpbnRlbF9wc3JfZGlzYWJsZV9sb2NrZWQoaW50ZWxfZHApOwogCW11dGV4X3Vu
bG9jaygmZGV2X3ByaXYtPnBzci5sb2NrKTsKIAljYW5jZWxfd29ya19zeW5jKCZkZXZfcHJpdi0+
cHNyLndvcmspOwogfQpAQCAtOTkzLDMgKzEwMDIsMzQgQEAgdm9pZCBpbnRlbF9wc3JfaW5pdChz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZGV2X3ByaXYtPnBzci5zZXR1cF92
c2MgPSBoc3dfcHNyX3NldHVwX3ZzYzsKIAogfQorCit2b2lkIGludGVsX3Bzcl9zaG9ydF9wdWxz
ZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQoreworCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3Bv
cnQgKmludGVsX2RpZ19wb3J0ID0gZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApOworCXN0cnVjdCBk
cm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRldjsKKwlzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGk5MTVf
cHNyICpwc3IgPSAmZGV2X3ByaXYtPnBzcjsKKwl1OCB2YWw7CisKKwlpZiAoIUNBTl9QU1IoZGV2
X3ByaXYpIHx8ICFpbnRlbF9kcF9pc19lZHAoaW50ZWxfZHApKQorCQlyZXR1cm47CisKKwltdXRl
eF9sb2NrKCZwc3ItPmxvY2spOworCisJaWYgKHBzci0+ZW5hYmxlZCAhPSBpbnRlbF9kcCkKKwkJ
Z290byBleGl0OworCisJaWYgKGRybV9kcF9kcGNkX3JlYWRiKCZpbnRlbF9kcC0+YXV4LCBEUF9Q
U1JfU1RBVFVTLCAmdmFsKSAhPSAxKSB7CisJCURSTV9FUlJPUigiUFNSX1NUQVRVUyBkcGNkIHJl
YWQgZmFpbGVkXG4iKTsKKwkJZ290byBleGl0OworCX0KKworCWlmICgodmFsICYgRFBfUFNSX1NJ
TktfU1RBVEVfTUFTSykgPT0gRFBfUFNSX1NJTktfSU5URVJOQUxfRVJST1IpIHsKKwkJRFJNX0RF
QlVHX0tNUygiUFNSIHNpbmsgaW50ZXJuYWwgZXJyb3IsIGRpc2FibGluZyBQU1JcbiIpOworCQlp
bnRlbF9wc3JfZGlzYWJsZV9sb2NrZWQoaW50ZWxfZHApOworCX0KKworCS8qIFRPRE86IGhhbmRs
ZSBvdGhlciBQU1IvUFNSMiBlcnJvcnMgKi8KK2V4aXQ6CisJbXV0ZXhfdW5sb2NrKCZwc3ItPmxv
Y2spOworfQotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz
a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK