From: vathsala nagaraju Subject: [PATCH] drm/i915/psr: fix blank screen issue for psr2 Date: Wed, 14 Dec 2016 21:02:44 +0530 Message-ID: <1481729564-4974-1-git-send-email-vathsala.nagaraju@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 47F1F6E834 for ; Wed, 14 Dec 2016 15:33:10 +0000 (UTC) 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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org d2hlbiBwc3IyIGlzIGVuYWJsZWQsIHBzciBpZGxlIGNvbmRpdGlvbiBpcyB0YWtlbgpmcm9tIHBz cjEgcmVnaXN0ZXIoU1JEX1NUQVRVUykgaW5zdGVhZCBvZiBwc3IyX3N0YXR1cwpyZWdpc3Rlciwg cmVzdWx0aW5nIGluIGxvb3BpbmcgYW5kIGJsYW5rIHNjcmVlbi4KY29kZSBjaGFuZ2VkIHRvIGxv b2t1cCBmcm9tIHBzcjJfc3RhdHVzIGFuZApwc3IyX2N0bCBpbnN0ZWFkIG9mIHNyZF9zdGF0dXMg YW5kIHNyZF9jdGwgZm9yCnBzcjIgc2NlbmFyaW8uCgpDYzogUm9kcmlnbyBWaXZpIDxyb2RyaWdv LnZpdmlAaW50ZWwuY29tPgpDYzogSmltIEJyaWRlIDxqaW0uYnJpZGVAbGludXguaW50ZWwuY29t PgpTaWduZWQtb2ZmLWJ5OiB2YXRoc2FsYSBuYWdhcmFqdSA8dmF0aHNhbGEubmFnYXJhanVAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggIHwgIDQgKysKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIHwgNzkgKysrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA2MSBpbnNlcnRpb25zKCspLCAy MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCA5MDY4NWQyLi4yODkw YmM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTM2MTEsNiArMzYxMSwxMCBAQCBlbnVt IHsKICNkZWZpbmUgICBFRFBfUFNSMl9GUkFNRV9CRUZPUkVfU1VfTUFTSwkoMHhmPDw0KQogI2Rl ZmluZSAgIEVEUF9QU1IyX0lETEVfTUFTSwkJMHhmCiAKKyNkZWZpbmUgRURQX1BTUjJfU1RBVFVT X0NUTCAgICAgICAgICAgIF9NTUlPKDB4NmY5NDApCisjZGVmaW5lIEVEUF9QU1IyX1NUQVRVU19T VEFURV9NQVNLICAgICAoMHhmPDwyOCkKKyNkZWZpbmUgRURQX1BTUjJfU1RBVFVTX1NUQVRFX0lE TEUgICAgIDAKKwogLyogVkdBIHBvcnQgY29udHJvbCAqLwogI2RlZmluZSBBRFBBCQkJX01NSU8o MHg2MTEwMCkKICNkZWZpbmUgUENIX0FEUEEgICAgICAgICAgICAgICAgX01NSU8oMHhlMTEwMCkK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggZDVmOGQwMy4uYzZiYzVkZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcHNyLmMKQEAgLTM5Nyw3ICszOTcsMTAgQEAgc3RhdGljIHZvaWQgaW50ZWxf cHNyX2FjdGl2YXRlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGludGVsX2RpZ19wb3J0LT5iYXNlLmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAotCVdBUk5fT04oSTkxNV9SRUFE KEVEUF9QU1JfQ1RMKSAmIEVEUF9QU1JfRU5BQkxFKTsKKwlpZiAoZGV2X3ByaXYtPnBzci5wc3Iy X3N1cHBvcnQpCisJCVdBUk5fT04oSTkxNV9SRUFEKEVEUF9QU1IyX0NUTCkgJiBFRFBfUFNSMl9F TkFCTEUpOworCWVsc2UKKwkJV0FSTl9PTihJOTE1X1JFQUQoRURQX1BTUl9DVEwpICYgRURQX1BT Ul9FTkFCTEUpOwogCVdBUk5fT04oZGV2X3ByaXYtPnBzci5hY3RpdmUpOwogCWxvY2tkZXBfYXNz ZXJ0X2hlbGQoJmRldl9wcml2LT5wc3IubG9jayk7CiAKQEAgLTU0NCwyMCArNTQ3LDM3IEBAIHN0 YXRpYyB2b2lkIGhzd19wc3JfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAogCWlmIChk ZXZfcHJpdi0+cHNyLmFjdGl2ZSkgewotCQlJOTE1X1dSSVRFKEVEUF9QU1JfQ1RMLAotCQkJICAg STkxNV9SRUFEKEVEUF9QU1JfQ1RMKSAmIH5FRFBfUFNSX0VOQUJMRSk7CisJCWlmIChkZXZfcHJp di0+cHNyLnBzcjJfc3VwcG9ydCkKKwkJCUk5MTVfV1JJVEUoRURQX1BTUjJfQ1RMLAorCQkJCUk5 MTVfUkVBRChFRFBfUFNSMl9DVEwpICYKKwkJCQkJfihFRFBfUFNSMl9FTkFCTEUgfAorCQkJCQlF RFBfU1VfVFJBQ0tfRU5BQkxFKSk7CisJCWVsc2UKKwkJCUk5MTVfV1JJVEUoRURQX1BTUl9DVEws CisJCQkJICAgSTkxNV9SRUFEKEVEUF9QU1JfQ1RMKSAmIH5FRFBfUFNSX0VOQUJMRSk7CiAKIAkJ LyogV2FpdCB0aWxsIFBTUiBpcyBpZGxlICovCi0JCWlmIChpbnRlbF93YWl0X2Zvcl9yZWdpc3Rl cihkZXZfcHJpdiwKLQkJCQkJICAgIEVEUF9QU1JfU1RBVFVTX0NUTCwKLQkJCQkJICAgIEVEUF9Q U1JfU1RBVFVTX1NUQVRFX01BU0ssCi0JCQkJCSAgICAwLAotCQkJCQkgICAgMjAwMCkpCisJCWlm IChkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCkgeworCQkJaWYgKGludGVsX3dhaXRfZm9yX3Jl Z2lzdGVyKGRldl9wcml2LAorCQkJCQkJICAgIEVEUF9QU1IyX1NUQVRVU19DVEwsCisJCQkJCQkg ICAgRURQX1BTUjJfU1RBVFVTX1NUQVRFX01BU0ssCisJCQkJCQkgICAgMCwKKwkJCQkJCSAgICAy MDAwKSkKKwkJCURSTV9FUlJPUigiVGltZWQgb3V0IHdhaXRpbmcgZm9yIFBTUjIgSWRsZSBTdGF0 ZVxuIik7CisJCX0gZWxzZSB7CisJCQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoZGV2X3By aXYsCisJCQkJCQkgICAgRURQX1BTUl9TVEFUVVNfQ1RMLAorCQkJCQkJICAgIEVEUF9QU1JfU1RB VFVTX1NUQVRFX01BU0ssCisJCQkJCQkgICAgMCwKKwkJCQkJCSAgICAyMDAwKSkKIAkJCURSTV9F UlJPUigiVGltZWQgb3V0IHdhaXRpbmcgZm9yIFBTUiBJZGxlIFN0YXRlXG4iKTsKLQorCQl9CiAJ CWRldl9wcml2LT5wc3IuYWN0aXZlID0gZmFsc2U7CiAJfSBlbHNlIHsKLQkJV0FSTl9PTihJOTE1 X1JFQUQoRURQX1BTUl9DVEwpICYgRURQX1BTUl9FTkFCTEUpOworCQlpZiAoZGV2X3ByaXYtPnBz ci5wc3IyX3N1cHBvcnQpCisJCQlXQVJOX09OKEk5MTVfUkVBRChFRFBfUFNSMl9DVEwpICYgRURQ X1BTUjJfRU5BQkxFKTsKKwkJZWxzZQorCQkJV0FSTl9PTihJOTE1X1JFQUQoRURQX1BTUl9DVEwp ICYgRURQX1BTUl9FTkFCTEUpOwogCX0KIH0KIApAQCAtNjA4LDEzICs2MjgsMjQgQEAgc3RhdGlj IHZvaWQgaW50ZWxfcHNyX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCSAqIGFuZCBi ZSByZWFkeSBmb3IgcmUtZW5hYmxlLgogCSAqLwogCWlmIChIQVNfRERJKGRldl9wcml2KSkgewot CQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoZGV2X3ByaXYsCi0JCQkJCSAgICBFRFBfUFNS X1NUQVRVU19DVEwsCi0JCQkJCSAgICBFRFBfUFNSX1NUQVRVU19TVEFURV9NQVNLLAotCQkJCQkg ICAgMCwKLQkJCQkJICAgIDUwKSkgewotCQkJRFJNX0VSUk9SKCJUaW1lZCBvdXQgd2FpdGluZyBm b3IgUFNSIElkbGUgZm9yIHJlLWVuYWJsZVxuIik7Ci0JCQlyZXR1cm47CisJCWlmIChkZXZfcHJp di0+cHNyLnBzcjJfc3VwcG9ydCkgeworCQkJaWYgKGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyKGRl dl9wcml2LAorCQkJCQkJRURQX1BTUjJfU1RBVFVTX0NUTCwKKwkJCQkJCUVEUF9QU1IyX1NUQVRV U19TVEFURV9NQVNLLAorCQkJCQkJMCwKKwkJCQkJCTUwKSkgeworCQkJCURSTV9FUlJPUigiVGlt ZWQgb3V0IHdhaXRpbmcgZm9yIFBTUjIgSWRsZSBmb3IgcmUtZW5hYmxlXG4iKTsKKwkJCQlyZXR1 cm47CisJCQl9CisJCX0gZWxzZSB7CisJCQlpZiAoaW50ZWxfd2FpdF9mb3JfcmVnaXN0ZXIoZGV2 X3ByaXYsCisJCQkJCQlFRFBfUFNSX1NUQVRVU19DVEwsCisJCQkJCQlFRFBfUFNSX1NUQVRVU19T VEFURV9NQVNLLAorCQkJCQkJMCwKKwkJCQkJCTUwKSkgeworCQkJCURSTV9FUlJPUigiVGltZWQg b3V0IHdhaXRpbmcgZm9yIFBTUiBJZGxlIGZvciByZS1lbmFibGVcbiIpOworCQkJCXJldHVybjsK KwkJCX0KIAkJfQogCX0gZWxzZSB7CiAJCWlmIChpbnRlbF93YWl0X2Zvcl9yZWdpc3RlcihkZXZf cHJpdiwKQEAgLTY1NiwxMSArNjg3LDE1IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bzcl9leGl0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuOwogCiAJaWYgKEhBU19E REkoZGV2X3ByaXYpKSB7Ci0JCXZhbCA9IEk5MTVfUkVBRChFRFBfUFNSX0NUTCk7Ci0KLQkJV0FS Tl9PTighKHZhbCAmIEVEUF9QU1JfRU5BQkxFKSk7Ci0KLQkJSTkxNV9XUklURShFRFBfUFNSX0NU TCwgdmFsICYgfkVEUF9QU1JfRU5BQkxFKTsKKwkJaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBw b3J0KSB7CisJCQl2YWwgPSBJOTE1X1JFQUQoRURQX1BTUjJfQ1RMKTsKKwkJCVdBUk5fT04oISh2 YWwgJiBFRFBfUFNSMl9FTkFCTEUpKTsKKwkJCUk5MTVfV1JJVEUoRURQX1BTUjJfQ1RMLCB2YWwg JiB+RURQX1BTUjJfRU5BQkxFKTsKKwkJfSBlbHNlIHsKKwkJCXZhbCA9IEk5MTVfUkVBRChFRFBf UFNSX0NUTCk7CisJCQlXQVJOX09OKCEodmFsICYgRURQX1BTUl9FTkFCTEUpKTsKKwkJCUk5MTVf V1JJVEUoRURQX1BTUl9DVEwsIHZhbCAmIH5FRFBfUFNSX0VOQUJMRSk7CisJCX0KIAl9IGVsc2Ug ewogCQl2YWwgPSBJOTE1X1JFQUQoVkxWX1BTUkNUTChwaXBlKSk7CiAKLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK