From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH v2 06/10] drm/i915/psr: Do not override PSR2 sink support Date: Mon, 26 Mar 2018 18:06:30 -0700 Message-ID: <20180327010634.15917-6-jose.souza@intel.com> References: <20180327010634.15917-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: <20180327010634.15917-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 , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org U2luayBjYW4gc3VwcG9ydCBvdXIgUFNSMiByZXF1aXJlbWVudHMgYnV0IHVzZXJzcGFjZSBjYW4g cmVxdWVzdAphIHJlc29sdXRpb24gdGhhdCBQU1IyIGhhcmR3YXJlIGRvIG5vdCBzdXBwb3J0LCBp biB0aGlzIGNhc2UgaXQKd2FzIG92ZXJ3cml0dGVuIHRoZSBQU1IyIHNpbmsgc3VwcG9ydC4KQWRk aW5nIGFub3RoZXIgZmxhZyBoZXJlLCB0aGlzIHdheSBpZiByZXF1ZXN0ZWQgcmVzb2x1dGlvbiBj aGFuZ2VkCnRvIGEgdmFsdWUgdGhhdCBQU1IyIGhhcmR3YXJlIGNhbiBoYW5kbGUsIFBTUjIgY2Fu IGJlIGVuYWJsZWQuCgpDYzogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhpbmFrYXJhbi5wYW5kaXlh bkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEpvc8OpIFJvYmVydG8gZGUgU291emEgPGpvc2Uuc291emFA aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgIDQg KystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgMyArKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jICAgIHwgMzMgKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDE5IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggNzgxNmNkNTMxMDBh Li4xNmY5OTc3OTk1ZGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0yNjMw LDcgKzI2MzAsNyBAQCBzdGF0aWMgaW50IGk5MTVfZWRwX3Bzcl9zdGF0dXMoc3RydWN0IHNlcV9m aWxlICptLCB2b2lkICpkYXRhKQogCQkgICB5ZXNubyh3b3JrX2J1c3koJmRldl9wcml2LT5wc3Iu d29yay53b3JrKSkpOwogCiAJaWYgKEhBU19EREkoZGV2X3ByaXYpKSB7Ci0JCWlmIChkZXZfcHJp di0+cHNyLnBzcjJfc3VwcG9ydCkKKwkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9lbmFibGVkKQog CQkJZW5hYmxlZCA9IEk5MTVfUkVBRChFRFBfUFNSMl9DVEwpICYgRURQX1BTUjJfRU5BQkxFOwog CQllbHNlCiAJCQllbmFibGVkID0gSTkxNV9SRUFEKEVEUF9QU1JfQ1RMKSAmIEVEUF9QU1JfRU5B QkxFOwpAQCAtMjY3OCw3ICsyNjc4LDcgQEAgc3RhdGljIGludCBpOTE1X2VkcF9wc3Jfc3RhdHVz KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAogCQlzZXFfcHJpbnRmKG0sICJQZXJm b3JtYW5jZV9Db3VudGVyOiAldVxuIiwgcHNycGVyZik7CiAJfQotCWlmIChkZXZfcHJpdi0+cHNy LnBzcjJfc3VwcG9ydCkgeworCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCkgewogCQl1 MzIgcHNyMiA9IEk5MTVfUkVBRChFRFBfUFNSMl9TVEFUVVMpOwogCiAJCXNlcV9wcmludGYobSwg IkVEUF9QU1IyX1NUQVRVUzogJXggWyVzXVxuIiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IDkyY2Y2ZjRlOWUwMC4uNDZjYWUwOTcyMDFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTYwMiwxMSArNjAyLDEyIEBAIHN0cnVjdCBpOTE1X3BzciB7CiAJYm9vbCBhY3RpdmU7CiAJc3Ry dWN0IGRlbGF5ZWRfd29yayB3b3JrOwogCXVuc2lnbmVkIGJ1c3lfZnJvbnRidWZmZXJfYml0czsK LQlib29sIHBzcjJfc3VwcG9ydDsKKwlib29sIHNpbmtfcHNyMl9zdXBwb3J0OwogCWJvb2wgbGlu a19zdGFuZGJ5OwogCWJvb2wgY29sb3JpbWV0cnlfc3VwcG9ydDsKIAlib29sIGFscG07CiAJYm9v bCBoYXNfaHdfdHJhY2tpbmc7CisJYm9vbCBwc3IyX2VuYWJsZWQ7CiAKIAl2b2lkICgqZW5hYmxl X3NvdXJjZSkoc3RydWN0IGludGVsX2RwICosCiAJCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggODRlMWY4YmU1YzQ4 Li41ZWZkZGQ5MjA2ODEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC0xNDgsMTEgKzE0 OCwxMiBAQCB2b2lkIGludGVsX3Bzcl9pbml0X2RwY2Qoc3RydWN0IGludGVsX2RwICppbnRlbF9k cCkKIAkJICogWS1jb29yZGluYXRlIHJlcXVpcmVtZW50IHBhbmVscyB3ZSB3b3VsZCBuZWVkIHRv IGVuYWJsZQogCQkgKiBHVEMgZmlyc3QuCiAJCSAqLwotCQlkZXZfcHJpdi0+cHNyLnBzcjJfc3Vw cG9ydCA9IGludGVsX2RwX2dldF95X2Nvb3JkX3JlcXVpcmVkKGludGVsX2RwKTsKLQkJRFJNX0RF QlVHX0tNUygiUFNSMiAlcyBvbiBzaW5rIiwKLQkJCSAgICAgIGRldl9wcml2LT5wc3IucHNyMl9z dXBwb3J0ID8gInN1cHBvcnRlZCIgOiAibm90IHN1cHBvcnRlZCIpOworCQlkZXZfcHJpdi0+cHNy LnNpbmtfcHNyMl9zdXBwb3J0ID0KKwkJCQlpbnRlbF9kcF9nZXRfeV9jb29yZF9yZXF1aXJlZChp bnRlbF9kcCk7CisJCURSTV9ERUJVR19LTVMoIlBTUjIgJXMgb24gc2luayIsIGRldl9wcml2LT5w c3Iuc2lua19wc3IyX3N1cHBvcnQKKwkJCSAgICAgID8gInN1cHBvcnRlZCIgOiAibm90IHN1cHBv cnRlZCIpOwogCi0JCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkgeworCQlpZiAoZGV2 X3ByaXYtPnBzci5zaW5rX3BzcjJfc3VwcG9ydCkgewogCQkJZGV2X3ByaXYtPnBzci5jb2xvcmlt ZXRyeV9zdXBwb3J0ID0KIAkJCQlpbnRlbF9kcF9nZXRfY29sb3JpbWV0cnlfc3RhdHVzKGludGVs X2RwKTsKIAkJCWRldl9wcml2LT5wc3IuYWxwbSA9CkBAIC0xOTMsNyArMTk0LDcgQEAgc3RhdGlj IHZvaWQgaHN3X3Bzcl9zZXR1cF92c2Moc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVsX2RpZ19wb3J0LT5i YXNlLmJhc2UuZGV2KTsKIAlzdHJ1Y3QgZWRwX3ZzY19wc3IgcHNyX3ZzYzsKIAotCWlmIChkZXZf cHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkgeworCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxl ZCkgewogCQkvKiBQcmVwYXJlIFZTQyBIZWFkZXIgZm9yIFNVIGFzIHBlciBFRFAgMS40IHNwZWMs IFRhYmxlIDYuMTEgKi8KIAkJbWVtc2V0KCZwc3JfdnNjLCAwLCBzaXplb2YocHNyX3ZzYykpOwog CQlwc3JfdnNjLnNkcF9oZWFkZXIuSEIwID0gMDsKQEAgLTI2NSw3ICsyNjYsNyBAQCBzdGF0aWMg dm9pZCBoc3dfcHNyX2VuYWJsZV9zaW5rKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCiAJLyogRW5h YmxlIEFMUE0gYXQgc2luayBmb3IgcHNyMiAqLwotCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfc3Vw cG9ydCAmJiBkZXZfcHJpdi0+cHNyLmFscG0pCisJaWYgKGRldl9wcml2LT5wc3IucHNyMl9lbmFi bGVkICYmIGRldl9wcml2LT5wc3IuYWxwbSkKIAkJZHJtX2RwX2RwY2Rfd3JpdGViKCZpbnRlbF9k cC0+YXV4LAogCQkJCURQX1JFQ0VJVkVSX0FMUE1fQ09ORklHLAogCQkJCURQX0FMUE1fRU5BQkxF KTsKQEAgLTQyNCw3ICs0MjUsNyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2FjdGl2YXRlKHN0cnVj dCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJICovCiAKIAkvKiBwc3IxIGFuZCBwc3IyIGFyZSBtdXR1 YWxseSBleGNsdXNpdmUuKi8KLQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpCisJaWYg KGRldl9wcml2LT5wc3IucHNyMl9lbmFibGVkKQogCQloc3dfYWN0aXZhdGVfcHNyMihpbnRlbF9k cCk7CiAJZWxzZQogCQloc3dfYWN0aXZhdGVfcHNyMShpbnRlbF9kcCk7CkBAIC00NDQsNyArNDQ1 LDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfcHNyMl9jb25maWdfdmFsaWQoc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCwKIAkgKiBkeW5hbWljYWxseSBkdXJpbmcgUFNSIGVuYWJsZSwgYW5kIGV4dHJh Y3RlZCBmcm9tIHNpbmsKIAkgKiBjYXBzIGR1cmluZyBlRFAgZGV0ZWN0aW9uLgogCSAqLwotCWlm ICghZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpCisJaWYgKCFkZXZfcHJpdi0+cHNyLnNpbmtf cHNyMl9zdXBwb3J0KQogCQlyZXR1cm4gZmFsc2U7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSAxMCB8fCBJU19HRU1JTklMQUtFKGRldl9wcml2KSkgewpAQCAtNTQzLDcgKzU0NCw3IEBA IHN0YXRpYyB2b2lkIGludGVsX3Bzcl9hY3RpdmF0ZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw KQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRlbF9kaWdfcG9ydC0+YmFzZS5iYXNlLmRl djsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAK LQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpCisJaWYgKGRldl9wcml2LT5wc3IucHNy Ml9lbmFibGVkKQogCQlXQVJOX09OKEk5MTVfUkVBRChFRFBfUFNSMl9DVEwpICYgRURQX1BTUjJf RU5BQkxFKTsKIAllbHNlCiAJCVdBUk5fT04oSTkxNV9SRUFEKEVEUF9QU1JfQ1RMKSAmIEVEUF9Q U1JfRU5BQkxFKTsKQEAgLTU3MCw3ICs1NzEsNyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2VuYWJs ZV9zb3VyY2Uoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAlpZiAoSVNfSEFTV0VMTChkZXZf cHJpdikgfHwgSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJaHN3X3Bzcl9zZXR1cF9hdXgoaW50 ZWxfZHApOwogCi0JaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KSB7CisJaWYgKGRldl9w cml2LT5wc3IucHNyMl9lbmFibGVkKSB7CiAJCXUzMiBjaGlja2VuID0gSTkxNV9SRUFEKENISUNL RU5fVFJBTlMoY3B1X3RyYW5zY29kZXIpKTsKIAogCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA9 PSA5ICYmICFJU19HRU1JTklMQUtFKGRldl9wcml2KSkKQEAgLTYyOSw3ICs2MzAsNyBAQCB2b2lk IGludGVsX3Bzcl9lbmFibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJZ290byB1bmxv Y2s7CiAJfQogCi0JZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQgPSBjcnRjX3N0YXRlLT5oYXNf cHNyMjsKKwlkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCA9IGNydGNfc3RhdGUtPmhhc19wc3Iy OwogCWRldl9wcml2LT5wc3IuYnVzeV9mcm9udGJ1ZmZlcl9iaXRzID0gMDsKIAogCWRldl9wcml2 LT5wc3Iuc2V0dXBfdnNjKGludGVsX2RwLCBjcnRjX3N0YXRlKTsKQEAgLTY5OSw3ICs3MDAsNyBA QCBzdGF0aWMgdm9pZCBoc3dfcHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwK IAkJaTkxNV9yZWdfdCBwc3Jfc3RhdHVzOwogCQl1MzIgcHNyX3N0YXR1c19tYXNrOwogCi0JCWlm IChkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkgeworCQlpZiAoZGV2X3ByaXYtPnBzci5wc3Iy X2VuYWJsZWQpIHsKIAkJCXBzcl9zdGF0dXMgPSBFRFBfUFNSMl9TVEFUVVM7CiAJCQlwc3Jfc3Rh dHVzX21hc2sgPSBFRFBfUFNSMl9TVEFUVVNfU1RBVEVfTUFTSzsKIApAQCAtNzIzLDcgKzcyNCw3 IEBAIHN0YXRpYyB2b2lkIGhzd19wc3JfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw LAogCiAJCWRldl9wcml2LT5wc3IuYWN0aXZlID0gZmFsc2U7CiAJfSBlbHNlIHsKLQkJaWYgKGRl dl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KQorCQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJs ZWQpCiAJCQlXQVJOX09OKEk5MTVfUkVBRChFRFBfUFNSMl9DVEwpICYgRURQX1BTUjJfRU5BQkxF KTsKIAkJZWxzZQogCQkJV0FSTl9PTihJOTE1X1JFQUQoRURQX1BTUl9DVEwpICYgRURQX1BTUl9F TkFCTEUpOwpAQCAtNzgzLDcgKzc4NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bzcl93b3JrKHN0 cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkgKiBhbmQgYmUgcmVhZHkgZm9yIHJlLWVuYWJsZS4K IAkgKi8KIAlpZiAoSEFTX0RESShkZXZfcHJpdikpIHsKLQkJaWYgKGRldl9wcml2LT5wc3IucHNy Ml9zdXBwb3J0KSB7CisJCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCkgewogCQkJaWYg KGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyKGRldl9wcml2LAogCQkJCQkJICAgIEVEUF9QU1IyX1NU QVRVUywKIAkJCQkJCSAgICBFRFBfUFNSMl9TVEFUVVNfU1RBVEVfTUFTSywKQEAgLTg0Miw3ICs4 NDMsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wc3JfZXhpdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJCXJldHVybjsKIAogCWlmIChIQVNfRERJKGRldl9wcml2KSkgewotCQlp ZiAoZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpIHsKKwkJaWYgKGRldl9wcml2LT5wc3IucHNy Ml9lbmFibGVkKSB7CiAJCQl2YWwgPSBJOTE1X1JFQUQoRURQX1BTUjJfQ1RMKTsKIAkJCVdBUk5f T04oISh2YWwgJiBFRFBfUFNSMl9FTkFCTEUpKTsKIAkJCUk5MTVfV1JJVEUoRURQX1BTUjJfQ1RM LCB2YWwgJiB+RURQX1BTUjJfRU5BQkxFKTsKQEAgLTEwMTEsNyArMTAxMiw3IEBAIHZvaWQgaW50 ZWxfcHNyX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCS8qIEJ5 IGRlZmluaXRpb24gZmx1c2ggPSBpbnZhbGlkYXRlICsgZmx1c2ggKi8KIAlpZiAoZnJvbnRidWZm ZXJfYml0cykgewotCQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQgfHwKKwkJaWYgKGRl dl9wcml2LT5wc3IucHNyMl9lbmFibGVkIHx8CiAJCSAgICBJU19WQUxMRVlWSUVXKGRldl9wcml2 KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQkJaW50ZWxfcHNyX2V4aXQoZGV2X3By aXYpOwogCQl9IGVsc2UgewotLSAKMi4xNi4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK