From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH 06/12] drm/i915/psr: Do not override PSR2 sink support Date: Thu, 22 Mar 2018 14:48:42 -0700 Message-ID: <20180322214848.28022-6-jose.souza@intel.com> References: <20180322214848.28022-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 DFC096E063 for ; Thu, 22 Mar 2018 21:51:59 +0000 (UTC) In-Reply-To: <20180322214848.28022-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 List-Id: intel-gfx@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 IGNjZTMyNjg2ZmQ3NS4uYTM2N2ZlNTUzOGFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTYwMSwxMSArNjAxLDEyIEBAIHN0cnVjdCBpOTE1X3BzciB7CiAJYm9vbCBhY3RpdmU7CiAJc3Ry dWN0IGRlbGF5ZWRfd29yayB3b3JrOwogCXVuc2lnbmVkIGJ1c3lfZnJvbnRidWZmZXJfYml0czsK LQlib29sIHBzcjJfc3VwcG9ydDsKKwlib29sIHNpbmtfcHNyMl9zdXBwb3J0OwogCWJvb2wgbGlu a19zdGFuZGJ5OwogCWJvb2wgY29sb3JpbWV0cnlfc3VwcG9ydDsKIAlib29sIGFscG07CiAJYm9v bCBoYXNfaHdfdHJhY2tpbmc7CisJYm9vbCBwc3IyX2VuYWJsZWQ7CiAKIAl2b2lkICgqZW5hYmxl X3NvdXJjZSkoc3RydWN0IGludGVsX2RwICosCiAJCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggNzZlMDIxNDI4ZTU3 Li5mNzNlMjczNGE4NTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bz 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 CQlwc3JfdnNjLnNkcF9oZWFkZXIuSEIwID0gMDsKQEAgLTI2Niw3ICsyNjcsNyBAQCBzdGF0aWMg dm9pZCBoc3dfcHNyX2VuYWJsZV9zaW5rKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAKIAog CS8qIEVuYWJsZSBBTFBNIGF0IHNpbmsgZm9yIHBzcjIgKi8KLQlpZiAoZGV2X3ByaXYtPnBzci5w c3IyX3N1cHBvcnQgJiYgZGV2X3ByaXYtPnBzci5hbHBtKQorCWlmIChkZXZfcHJpdi0+cHNyLnBz cjJfZW5hYmxlZCAmJiBkZXZfcHJpdi0+cHNyLmFscG0pCiAJCWRybV9kcF9kcGNkX3dyaXRlYigm aW50ZWxfZHAtPmF1eCwKIAkJCQlEUF9SRUNFSVZFUl9BTFBNX0NPTkZJRywKIAkJCQlEUF9BTFBN X0VOQUJMRSk7CkBAIC00MjUsNyArNDI2LDcgQEAgc3RhdGljIHZvaWQgaHN3X3Bzcl9hY3RpdmF0 ZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCSAqLwogCiAJLyogcHNyMSBhbmQgcHNyMiBh cmUgbXV0dWFsbHkgZXhjbHVzaXZlLiovCi0JaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0 KQorCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCkKIAkJaHN3X2FjdGl2YXRlX3BzcjIo aW50ZWxfZHApOwogCWVsc2UKIAkJaHN3X2FjdGl2YXRlX3BzcjEoaW50ZWxfZHApOwpAQCAtNDQ1 LDcgKzQ0Niw3IEBAIHN0YXRpYyBib29sIGludGVsX3BzcjJfY29uZmlnX3ZhbGlkKHN0cnVjdCBp bnRlbF9kcCAqaW50ZWxfZHAsCiAJICogZHluYW1pY2FsbHkgZHVyaW5nIFBTUiBlbmFibGUsIGFu ZCBleHRyYWN0ZWQgZnJvbSBzaW5rCiAJICogY2FwcyBkdXJpbmcgZURQIGRldGVjdGlvbi4KIAkg Ki8KLQlpZiAoIWRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KQorCWlmICghZGV2X3ByaXYtPnBz ci5zaW5rX3BzcjJfc3VwcG9ydCkKIAkJcmV0dXJuIGZhbHNlOwogCiAJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gMTAgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKQEAgLTU0NCw3ICs1 NDUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wc3JfYWN0aXZhdGUoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCkKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2Uu YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShk ZXYpOwogCi0JaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KQorCWlmIChkZXZfcHJpdi0+ cHNyLnBzcjJfZW5hYmxlZCkKIAkJV0FSTl9PTihJOTE1X1JFQUQoRURQX1BTUjJfQ1RMKSAmIEVE UF9QU1IyX0VOQUJMRSk7CiAJZWxzZQogCQlXQVJOX09OKEk5MTVfUkVBRChFRFBfUFNSX0NUTCkg JiBFRFBfUFNSX0VOQUJMRSk7CkBAIC01NzEsNyArNTcyLDcgQEAgc3RhdGljIHZvaWQgaHN3X3Bz cl9lbmFibGVfc291cmNlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJaWYgKElTX0hBU1dF TEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCiAJCWhzd19wc3Jfc2V0dXBf YXV4KGludGVsX2RwKTsKIAotCWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkgeworCWlm IChkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCkgewogCQl1MzIgY2hpY2tlbiA9IEk5MTVfUkVB RChDSElDS0VOX1RSQU5TKGNwdV90cmFuc2NvZGVyKSk7CiAKIAkJaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPT0gOSAmJiAhSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCkBAIC02MzAsNyArNjMxLDcg QEAgdm9pZCBpbnRlbF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJCWdv dG8gdW5sb2NrOwogCX0KIAotCWRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0ID0gY3J0Y19zdGF0 ZS0+aGFzX3BzcjI7CisJZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQgPSBjcnRjX3N0YXRlLT5o YXNfcHNyMjsKIAlkZXZfcHJpdi0+cHNyLmJ1c3lfZnJvbnRidWZmZXJfYml0cyA9IDA7CiAKIAlk ZXZfcHJpdi0+cHNyLnNldHVwX3ZzYyhpbnRlbF9kcCwgY3J0Y19zdGF0ZSk7CkBAIC03MDAsNyAr NzAxLDcgQEAgc3RhdGljIHZvaWQgaHN3X3Bzcl9kaXNhYmxlKHN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAsCiAJCWk5MTVfcmVnX3QgcHNyX3N0YXR1czsKIAkJdTMyIHBzcl9zdGF0dXNfbWFzazsK IAotCQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpIHsKKwkJaWYgKGRldl9wcml2LT5w c3IucHNyMl9lbmFibGVkKSB7CiAJCQlwc3Jfc3RhdHVzID0gRURQX1BTUjJfU1RBVFVTOwogCQkJ cHNyX3N0YXR1c19tYXNrID0gRURQX1BTUjJfU1RBVFVTX1NUQVRFX01BU0s7CiAKQEAgLTcyNCw3 ICs3MjUsNyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2Rpc2FibGUoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCwKIAogCQlkZXZfcHJpdi0+cHNyLmFjdGl2ZSA9IGZhbHNlOwogCX0gZWxzZSB7Ci0J CWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkKKwkJaWYgKGRldl9wcml2LT5wc3IucHNy Ml9lbmFibGVkKQogCQkJV0FSTl9PTihJOTE1X1JFQUQoRURQX1BTUjJfQ1RMKSAmIEVEUF9QU1Iy X0VOQUJMRSk7CiAJCWVsc2UKIAkJCVdBUk5fT04oSTkxNV9SRUFEKEVEUF9QU1JfQ1RMKSAmIEVE UF9QU1JfRU5BQkxFKTsKQEAgLTc4NCw3ICs3ODUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wc3Jf d29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJICogYW5kIGJlIHJlYWR5IGZvciByZS1l bmFibGUuCiAJICovCiAJaWYgKEhBU19EREkoZGV2X3ByaXYpKSB7Ci0JCWlmIChkZXZfcHJpdi0+ cHNyLnBzcjJfc3VwcG9ydCkgeworCQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX2VuYWJsZWQpIHsK IAkJCWlmIChpbnRlbF93YWl0X2Zvcl9yZWdpc3RlcihkZXZfcHJpdiwKIAkJCQkJCSAgICBFRFBf UFNSMl9TVEFUVVMsCiAJCQkJCQkgICAgRURQX1BTUjJfU1RBVFVTX1NUQVRFX01BU0ssCkBAIC04 NDMsNyArODQ0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHNyX2V4aXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCQlyZXR1cm47CiAKIAlpZiAoSEFTX0RESShkZXZfcHJpdikp IHsKLQkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KSB7CisJCWlmIChkZXZfcHJpdi0+ cHNyLnBzcjJfZW5hYmxlZCkgewogCQkJdmFsID0gSTkxNV9SRUFEKEVEUF9QU1IyX0NUTCk7CiAJ CQlXQVJOX09OKCEodmFsICYgRURQX1BTUjJfRU5BQkxFKSk7CiAJCQlJOTE1X1dSSVRFKEVEUF9Q U1IyX0NUTCwgdmFsICYgfkVEUF9QU1IyX0VOQUJMRSk7CkBAIC0xMDEyLDcgKzEwMTMsNyBAQCB2 b2lkIGludGVsX3Bzcl9mbHVzaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAK IAkvKiBCeSBkZWZpbml0aW9uIGZsdXNoID0gaW52YWxpZGF0ZSArIGZsdXNoICovCiAJaWYgKGZy b250YnVmZmVyX2JpdHMpIHsKLQkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0IHx8CisJ CWlmIChkZXZfcHJpdi0+cHNyLnBzcjJfZW5hYmxlZCB8fAogCQkgICAgSVNfVkFMTEVZVklFVyhk ZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJCWludGVsX3Bzcl9leGl0 KGRldl9wcml2KTsKIAkJfSBlbHNlIHsKLS0gCjIuMTYuMgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==