From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v3 06/10] drm/i915/psr: Do not override PSR2 sink support Date: Wed, 28 Mar 2018 15:30:42 -0700 Message-ID: <20180328223046.16125-6-jose.souza@intel.com> References: <20180328223046.16125-1-jose.souza@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180328223046.16125-1-jose.souza@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= , Dhinakaran Pandiyan , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org U2luayBjYW4gc3VwcG9ydCBvdXIgUFNSMiByZXF1aXJlbWVudHMgYnV0IHVzZXJzcGFjZSBjYW4g cmVxdWVzdAphIHJlc29sdXRpb24gdGhhdCBQU1IyIGhhcmR3YXJlIGRvIG5vdCBzdXBwb3J0LCBp biB0aGlzIGNhc2UgaXQKd2FzIG92ZXJ3cml0dGVuIHRoZSBQU1IyIHNpbmsgc3VwcG9ydC4KQWRk aW5nIGFub3RoZXIgZmxhZyBoZXJlLCB0aGlzIHdheSBpZiByZXF1ZXN0ZWQgcmVzb2x1dGlvbiBj aGFuZ2VkCnRvIGEgdmFsdWUgdGhhdCBQU1IyIGhhcmR3YXJlIGNhbiBoYW5kbGUsIFBTUjIgY2Fu IGJlIGVuYWJsZWQuCgpDYzogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhpbmFrYXJhbi5wYW5kaXlh bkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291emFA aW50ZWwuY29tPgotLS0KCnYzOiByZWJhc2VkCgogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICB8 ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgICAgfCAzMyArKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9u cygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRl eCBmZjkwNTc3ZGE0NTAuLjFkYmEyYzQ1MTI1NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKQEAgLTI2MzAsNyArMjYzMCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9lZHBfcHNyX3N0YXR1 cyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJCSAgIHllc25vKHdvcmtfYnVzeSgm ZGV2X3ByaXYtPnBzci53b3JrLndvcmspKSk7CiAKIAlpZiAoSEFTX0RESShkZXZfcHJpdikpIHsK LQkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KQorCQlpZiAoZGV2X3ByaXYtPnBzci5w c3IyX2VuYWJsZWQpCiAJCQllbmFibGVkID0gSTkxNV9SRUFEKEVEUF9QU1IyX0NUTCkgJiBFRFBf UFNSMl9FTkFCTEU7CiAJCWVsc2UKIAkJCWVuYWJsZWQgPSBJOTE1X1JFQUQoRURQX1BTUl9DVEwp ICYgRURQX1BTUl9FTkFCTEU7CkBAIC0yNjc4LDcgKzI2NzgsNyBAQCBzdGF0aWMgaW50IGk5MTVf ZWRwX3Bzcl9zdGF0dXMoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCiAJCXNlcV9w cmludGYobSwgIlBlcmZvcm1hbmNlX0NvdW50ZXI6ICV1XG4iLCBwc3JwZXJmKTsKIAl9Ci0JaWYg KGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KSB7CisJaWYgKGRldl9wcml2LT5wc3IucHNyMl9l bmFibGVkKSB7CiAJCXUzMiBwc3IyID0gSTkxNV9SRUFEKEVEUF9QU1IyX1NUQVRVUyk7CiAKIAkJ c2VxX3ByaW50ZihtLCAiRURQX1BTUjJfU1RBVFVTOiAleCBbJXNdXG4iLApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKaW5kZXggOTJjZjZmNGU5ZTAwLi40NmNhZTA5NzIwMWMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaApAQCAtNjAyLDExICs2MDIsMTIgQEAgc3RydWN0IGk5MTVfcHNyIHsKIAlib29s IGFjdGl2ZTsKIAlzdHJ1Y3QgZGVsYXllZF93b3JrIHdvcms7CiAJdW5zaWduZWQgYnVzeV9mcm9u dGJ1ZmZlcl9iaXRzOwotCWJvb2wgcHNyMl9zdXBwb3J0OworCWJvb2wgc2lua19wc3IyX3N1cHBv cnQ7CiAJYm9vbCBsaW5rX3N0YW5kYnk7CiAJYm9vbCBjb2xvcmltZXRyeV9zdXBwb3J0OwogCWJv b2wgYWxwbTsKIAlib29sIGhhc19od190cmFja2luZzsKKwlib29sIHBzcjJfZW5hYmxlZDsKIAog CXZvaWQgKCplbmFibGVfc291cmNlKShzdHJ1Y3QgaW50ZWxfZHAgKiwKIAkJCSAgICAgIGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICopOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRl eCA4NGUxZjhiZTVjNDguLjVlZmRkZDkyMDY4MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMK QEAgLTE0OCwxMSArMTQ4LDEyIEBAIHZvaWQgaW50ZWxfcHNyX2luaXRfZHBjZChzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwKQogCQkgKiBZLWNvb3JkaW5hdGUgcmVxdWlyZW1lbnQgcGFuZWxzIHdl IHdvdWxkIG5lZWQgdG8gZW5hYmxlCiAJCSAqIEdUQyBmaXJzdC4KIAkJICovCi0JCWRldl9wcml2 LT5wc3IucHNyMl9zdXBwb3J0ID0gaW50ZWxfZHBfZ2V0X3lfY29vcmRfcmVxdWlyZWQoaW50ZWxf ZHApOwotCQlEUk1fREVCVUdfS01TKCJQU1IyICVzIG9uIHNpbmsiLAotCQkJICAgICAgZGV2X3By aXYtPnBzci5wc3IyX3N1cHBvcnQgPyAic3VwcG9ydGVkIiA6ICJub3Qgc3VwcG9ydGVkIik7CisJ CWRldl9wcml2LT5wc3Iuc2lua19wc3IyX3N1cHBvcnQgPQorCQkJCWludGVsX2RwX2dldF95X2Nv b3JkX3JlcXVpcmVkKGludGVsX2RwKTsKKwkJRFJNX0RFQlVHX0tNUygiUFNSMiAlcyBvbiBzaW5r IiwgZGV2X3ByaXYtPnBzci5zaW5rX3BzcjJfc3VwcG9ydAorCQkJICAgICAgPyAic3VwcG9ydGVk IiA6ICJub3Qgc3VwcG9ydGVkIik7CiAKLQkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0 KSB7CisJCWlmIChkZXZfcHJpdi0+cHNyLnNpbmtfcHNyMl9zdXBwb3J0KSB7CiAJCQlkZXZfcHJp di0+cHNyLmNvbG9yaW1ldHJ5X3N1cHBvcnQgPQogCQkJCWludGVsX2RwX2dldF9jb2xvcmltZXRy eV9zdGF0dXMoaW50ZWxfZHApOwogCQkJZGV2X3ByaXYtPnBzci5hbHBtID0KQEAgLTE5Myw3ICsx OTQsNyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX3NldHVwX3ZzYyhzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50 ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXYpOwogCXN0cnVjdCBlZHBfdnNjX3BzciBwc3JfdnNj OwogCi0JaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KSB7CisJaWYgKGRldl9wcml2LT5w c3IucHNyMl9lbmFibGVkKSB7CiAJCS8qIFByZXBhcmUgVlNDIEhlYWRlciBmb3IgU1UgYXMgcGVy IEVEUCAxLjQgc3BlYywgVGFibGUgNi4xMSAqLwogCQltZW1zZXQoJnBzcl92c2MsIDAsIHNpemVv Zihwc3JfdnNjKSk7CiAJCXBzcl92c2Muc2RwX2hlYWRlci5IQjAgPSAwOwpAQCAtMjY1LDcgKzI2 Niw3IEBAIHN0YXRpYyB2b2lkIGhzd19wc3JfZW5hYmxlX3Npbmsoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRl dik7CiAKIAkvKiBFbmFibGUgQUxQTSBhdCBzaW5rIGZvciBwc3IyICovCi0JaWYgKGRldl9wcml2 LT5wc3IucHNyMl9zdXBwb3J0ICYmIGRldl9wcml2LT5wc3IuYWxwbSkKKwlpZiAoZGV2X3ByaXYt PnBzci5wc3IyX2VuYWJsZWQgJiYgZGV2X3ByaXYtPnBzci5hbHBtKQogCQlkcm1fZHBfZHBjZF93 cml0ZWIoJmludGVsX2RwLT5hdXgsCiAJCQkJRFBfUkVDRUlWRVJfQUxQTV9DT05GSUcsCiAJCQkJ RFBfQUxQTV9FTkFCTEUpOwpAQCAtNDI0LDcgKzQyNSw3IEBAIHN0YXRpYyB2b2lkIGhzd19wc3Jf YWN0aXZhdGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkgKi8KIAogCS8qIHBzcjEgYW5k IHBzcjIgYXJlIG11dHVhbGx5IGV4Y2x1c2l2ZS4qLwotCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJf c3VwcG9ydCkKKwlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQpCiAJCWhzd19hY3RpdmF0 ZV9wc3IyKGludGVsX2RwKTsKIAllbHNlCiAJCWhzd19hY3RpdmF0ZV9wc3IxKGludGVsX2RwKTsK QEAgLTQ0NCw3ICs0NDUsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9wc3IyX2NvbmZpZ192YWxpZChz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCSAqIGR5bmFtaWNhbGx5IGR1cmluZyBQU1IgZW5h YmxlLCBhbmQgZXh0cmFjdGVkIGZyb20gc2luawogCSAqIGNhcHMgZHVyaW5nIGVEUCBkZXRlY3Rp b24uCiAJICovCi0JaWYgKCFkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkKKwlpZiAoIWRldl9w cml2LT5wc3Iuc2lua19wc3IyX3N1cHBvcnQpCiAJCXJldHVybiBmYWxzZTsKIAogCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDEwIHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKSB7CkBAIC01 NDMsNyArNTQ0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHNyX2FjdGl2YXRlKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHApCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2RpZ19wb3J0 LT5iYXNlLmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKIAotCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkKKwlpZiAoZGV2 X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQpCiAJCVdBUk5fT04oSTkxNV9SRUFEKEVEUF9QU1IyX0NU TCkgJiBFRFBfUFNSMl9FTkFCTEUpOwogCWVsc2UKIAkJV0FSTl9PTihJOTE1X1JFQUQoRURQX1BT Ul9DVEwpICYgRURQX1BTUl9FTkFCTEUpOwpAQCAtNTcwLDcgKzU3MSw3IEBAIHN0YXRpYyB2b2lk IGhzd19wc3JfZW5hYmxlX3NvdXJjZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCWlmIChJ U19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKQogCQloc3dfcHNy X3NldHVwX2F1eChpbnRlbF9kcCk7CiAKLQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQp IHsKKwlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQpIHsKIAkJdTMyIGNoaWNrZW4gPSBJ OTE1X1JFQUQoQ0hJQ0tFTl9UUkFOUyhjcHVfdHJhbnNjb2RlcikpOwogCiAJCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpID09IDkgJiYgIUlTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQpAQCAtNjI5LDcg KzYzMCw3IEBAIHZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw LAogCQlnb3RvIHVubG9jazsKIAl9CiAKLQlkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCA9IGNy dGNfc3RhdGUtPmhhc19wc3IyOworCWRldl9wcml2LT5wc3IucHNyMl9lbmFibGVkID0gY3J0Y19z dGF0ZS0+aGFzX3BzcjI7CiAJZGV2X3ByaXYtPnBzci5idXN5X2Zyb250YnVmZmVyX2JpdHMgPSAw OwogCiAJZGV2X3ByaXYtPnBzci5zZXR1cF92c2MoaW50ZWxfZHAsIGNydGNfc3RhdGUpOwpAQCAt Njk5LDcgKzcwMCw3IEBAIHN0YXRpYyB2b2lkIGhzd19wc3JfZGlzYWJsZShzdHJ1Y3QgaW50ZWxf ZHAgKmludGVsX2RwLAogCQlpOTE1X3JlZ190IHBzcl9zdGF0dXM7CiAJCXUzMiBwc3Jfc3RhdHVz X21hc2s7CiAKLQkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KSB7CisJCWlmIChkZXZf cHJpdi0+cHNyLnBzcjJfZW5hYmxlZCkgewogCQkJcHNyX3N0YXR1cyA9IEVEUF9QU1IyX1NUQVRV UzsKIAkJCXBzcl9zdGF0dXNfbWFzayA9IEVEUF9QU1IyX1NUQVRVU19TVEFURV9NQVNLOwogCkBA IC03MjMsNyArNzI0LDcgQEAgc3RhdGljIHZvaWQgaHN3X3Bzcl9kaXNhYmxlKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAsCiAKIAkJZGV2X3ByaXYtPnBzci5hY3RpdmUgPSBmYWxzZTsKIAl9IGVs c2UgewotCQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpCisJCWlmIChkZXZfcHJpdi0+ cHNyLnBzcjJfZW5hYmxlZCkKIAkJCVdBUk5fT04oSTkxNV9SRUFEKEVEUF9QU1IyX0NUTCkgJiBF RFBfUFNSMl9FTkFCTEUpOwogCQllbHNlCiAJCQlXQVJOX09OKEk5MTVfUkVBRChFRFBfUFNSX0NU TCkgJiBFRFBfUFNSX0VOQUJMRSk7CkBAIC03ODMsNyArNzg0LDcgQEAgc3RhdGljIHZvaWQgaW50 ZWxfcHNyX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCSAqIGFuZCBiZSByZWFkeSBm b3IgcmUtZW5hYmxlLgogCSAqLwogCWlmIChIQVNfRERJKGRldl9wcml2KSkgewotCQlpZiAoZGV2 X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpIHsKKwkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9lbmFi bGVkKSB7CiAJCQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoZGV2X3ByaXYsCiAJCQkJCQkg ICAgRURQX1BTUjJfU1RBVFVTLAogCQkJCQkJICAgIEVEUF9QU1IyX1NUQVRVU19TVEFURV9NQVNL LApAQCAtODQyLDcgKzg0Myw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bzcl9leGl0KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuOwogCiAJaWYgKEhBU19EREkoZGV2 X3ByaXYpKSB7Ci0JCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkgeworCQlpZiAoZGV2 X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQpIHsKIAkJCXZhbCA9IEk5MTVfUkVBRChFRFBfUFNSMl9D VEwpOwogCQkJV0FSTl9PTighKHZhbCAmIEVEUF9QU1IyX0VOQUJMRSkpOwogCQkJSTkxNV9XUklU RShFRFBfUFNSMl9DVEwsIHZhbCAmIH5FRFBfUFNSMl9FTkFCTEUpOwpAQCAtMTAxMSw3ICsxMDEy LDcgQEAgdm9pZCBpbnRlbF9wc3JfZmx1c2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCiAJLyogQnkgZGVmaW5pdGlvbiBmbHVzaCA9IGludmFsaWRhdGUgKyBmbHVzaCAqLwog CWlmIChmcm9udGJ1ZmZlcl9iaXRzKSB7Ci0JCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9y dCB8fAorCQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQgfHwKIAkJICAgIElTX1ZBTExF WVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCQlpbnRlbF9w c3JfZXhpdChkZXZfcHJpdik7CiAJCX0gZWxzZSB7Ci0tIAoyLjE2LjMKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=