From mboxrd@z Thu Jan 1 00:00:00 1970 From: Animesh Manna Subject: [SKL-DMC-BUGFIX 2/5] drm/i915/skl: Making DC6 entry is the last call in suspend flow. Date: Mon, 3 Aug 2015 21:55:33 +0530 Message-ID: <1438619136-18268-3-git-send-email-animesh.manna@intel.com> References: <1438619136-18268-1-git-send-email-animesh.manna@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 721686E6BF for ; Mon, 3 Aug 2015 09:25:11 -0700 (PDT) In-Reply-To: <1438619136-18268-1-git-send-email-animesh.manna@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: Rajneesh Bhardwaj , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org TW1pbyByZWdpc3RlciBhY2Nlc3MgYWZ0ZXIgZGM2L2RjNSBlbnRyeSBpcyBub3QgYWxsb3dlZCB3 aGVuCkRDNiBwb3dlciBzdGF0ZXMgYXJlIGVuYWJsZWQgYWNjb3JkaW5nIHRvIGJzcGVjIChic3Bl Yy1pZCAwNTI3KSwKc28gZW5hYmxpbmcgZGM2IGFzIHRoZSBsYXN0IGNhbGwgaW4gc3VzcGVuZCBm bG93LgoKdjE6IEluaXRpYWwgdmVyc2lvbi4KCnYyOiBjb21taXQgbWVzc2FnZSB1cGRhdGVkIGJh c2VkIG9uIGNvbW1lbnQgZnJvbSBWYXRoc2FsYS4KCkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGludGVsLmNvbT4KQ2M6IERhbWllbiBMZXNwaWF1IDxkYW1pZW4ubGVzcGlhdUBpbnRl bC5jb20+CkNjOiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRlbC5jb20+CkNjOiBTdW5pbCBLYW1h dGggPHN1bmlsLmthbWF0aEBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFuaW1lc2ggTWFubmEg PGFuaW1lc2gubWFubmFAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBWYXRoc2FsYSBOYWdhcmFq dSA8dmF0aHNhbGEubmFnYXJhanVAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBSYWpuZWVzaCBC aGFyZHdhaiA8cmFqbmVlc2guYmhhcmR3YWpAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgICB8IDEyICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3J1bnRpbWVfcG0uYyB8IDMzICsrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCAwZDY3NzVhLi5lMWQwMTAyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKQEAgLTEwMTcsMTQgKzEwMTcsMTEgQEAgc3RhdGljIGludCBza2xfc3VzcGVu ZF9jb21wbGV0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJLyogRW5h YmxpbmcgREM2IGlzIG5vdCBhIGhhcmQgcmVxdWlyZW1lbnQgdG8gZW50ZXIgcnVudGltZSBEMyAq LwogCi0JLyoKLQkgKiBUaGlzIGlzIHRvIGVuc3VyZSB0aGF0IENTUiBpc24ndCBpZGVudGlmaWVk IGFzIGxvYWRlZCBiZWZvcmUKLQkgKiBDU1ItbG9hZGluZyBwcm9ncmFtIGlzIGNhbGxlZCBkdXJp bmcgcnVudGltZS1yZXN1bWUuCi0JICovCi0JaW50ZWxfY3NyX2xvYWRfc3RhdHVzX3NldChkZXZf cHJpdiwgRldfVU5JTklUSUFMSVpFRCk7Ci0KIAlza2xfdW5pbml0X2NkY2xrKGRldl9wcml2KTsK IAorCWlmIChpbnRlbF9jc3JfbG9hZF9zdGF0dXNfZ2V0KGRldl9wcml2KSA9PSBGV19MT0FERUQp CisJCXNrbF9lbmFibGVfZGM2KGRldl9wcml2KTsKKwogCXJldHVybiAwOwogfQogCkBAIC0xMDcx LDYgKzEwNjgsOSBAQCBzdGF0aWMgaW50IHNrbF9yZXN1bWVfcHJlcGFyZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9w cml2LT5kZXY7CiAKKwlpZiAoaW50ZWxfY3NyX2xvYWRfc3RhdHVzX2dldChkZXZfcHJpdikgPT0g RldfTE9BREVEKQorCQlza2xfZGlzYWJsZV9kYzYoZGV2X3ByaXYpOworCiAJc2tsX2luaXRfY2Rj bGsoZGV2X3ByaXYpOwogCWludGVsX2Nzcl9sb2FkX3Byb2dyYW0oZGV2KTsKIApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAppbmRleCA0N2NlZjBlLi4wNmYzNDZmIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtMTExNyw2ICsxMTE3LDggQEAgdm9pZCBieHRfZW5hYmxlX2RjOShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBieHRfZGlzYWJsZV9kYzkoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgc2tsX2luaXRfY2RjbGsoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgc2tsX3VuaW5pdF9jZGNsayhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwordm9pZCBza2xfZW5hYmxlX2RjNihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwordm9pZCBza2xfZGlzYWJsZV9kYzYoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIHZvaWQgaW50ZWxfZHBfZ2V0X21fbihz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KnBpcGVfY29uZmlnKTsKIHZvaWQgaW50ZWxfZHBfc2V0X21fbihzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YywgZW51bSBsaW5rX21fbl9zZXQgbV9uKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1 bnRpbWVfcG0uYwppbmRleCA2MzkzYjc2Li5jNjYwMjQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcnVudGltZV9wbS5jCkBAIC01MzIsNyArNTMyLDcgQEAgc3RhdGljIHZvaWQgYXNzZXJ0 X2Nhbl9kaXNhYmxlX2RjNihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCSJE QzYgYWxyZWFkeSBwcm9ncmFtbWVkIHRvIGJlIGRpc2FibGVkLlxuIik7CiB9CiAKLXN0YXRpYyB2 b2lkIHNrbF9lbmFibGVfZGM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3Zv aWQgc2tsX2VuYWJsZV9kYzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewog CXVpbnQzMl90IHZhbDsKIApAQCAtNTQ5LDcgKzU0OSw3IEBAIHN0YXRpYyB2b2lkIHNrbF9lbmFi bGVfZGM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlQT1NUSU5HX1JFQUQo RENfU1RBVEVfRU4pOwogfQogCi1zdGF0aWMgdm9pZCBza2xfZGlzYWJsZV9kYzYoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQordm9pZCBza2xfZGlzYWJsZV9kYzYoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXVpbnQzMl90IHZhbDsKIApAQCAtNjEwLDEw ICs2MTAsMTAgQEAgc3RhdGljIHZvaWQgc2tsX3NldF9wb3dlcl93ZWxsKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkhSTkxNV9SRUFEKEhTV19QV1JfV0VMTF9CSU9TKSwK IAkJCQkiSW52YWxpZCBmb3IgcG93ZXIgd2VsbCBzdGF0dXMgdG8gYmUgZW5hYmxlZCwgdW5sZXNz IGRvbmUgYnkgdGhlIEJJT1MsIFwKIAkJCQl3aGVuIHJlcXVlc3QgaXMgdG8gZGlzYWJsZSFcbiIp OwotCQkJaWYgKChHRU45X0VOQUJMRV9EQzUoZGV2KSB8fCBTS0xfRU5BQkxFX0RDNihkZXYpKSAm JgotCQkJCXBvd2VyX3dlbGwtPmRhdGEgPT0gU0tMX0RJU1BfUFdfMikgeworCQkJaWYgKHBvd2Vy X3dlbGwtPmRhdGEgPT0gU0tMX0RJU1BfUFdfMikgeworCQkJCWlmIChHRU45X0VOQUJMRV9EQzUo ZGV2KSkKKwkJCQkJZ2VuOV9kaXNhYmxlX2RjNShkZXZfcHJpdik7CiAJCQkJaWYgKFNLTF9FTkFC TEVfREM2KGRldikpIHsKLQkJCQkJc2tsX2Rpc2FibGVfZGM2KGRldl9wcml2KTsKIAkJCQkJLyoK IAkJCQkJICogRERJIGJ1ZmZlciBwcm9ncmFtbWluZyB1bm5lY2Vzc2FyeSBkdXJpbmcgZHJpdmVy LWxvYWQvcmVzdW1lCiAJCQkJCSAqIGFzIGl0J3MgYWxyZWFkeSBkb25lIGR1cmluZyBtb2Rlc2V0 IGluaXRpYWxpemF0aW9uIHRoZW4uCkBAIC02MjEsOCArNjIxLDYgQEAgc3RhdGljIHZvaWQgc2ts X3NldF9wb3dlcl93ZWxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkJ ICovCiAJCQkJCWlmICghZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnMuaW5pdGlhbGl6aW5nKQogCQkJ CQkJaW50ZWxfcHJlcGFyZV9kZGkoZGV2KTsKLQkJCQl9IGVsc2UgewotCQkJCQlnZW45X2Rpc2Fi bGVfZGM1KGRldl9wcml2KTsKIAkJCQl9CiAJCQl9CiAJCQlJOTE1X1dSSVRFKEhTV19QV1JfV0VM TF9EUklWRVIsIHRtcCB8IHJlcV9tYXNrKTsKQEAgLTY0MiwyNCArNjQwLDkgQEAgc3RhdGljIHZv aWQgc2tsX3NldF9wb3dlcl93ZWxsKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAkJCVBPU1RJTkdfUkVBRChIU1dfUFdSX1dFTExfRFJJVkVSKTsKIAkJCURSTV9ERUJVR19LTVMo IkRpc2FibGluZyAlc1xuIiwgcG93ZXJfd2VsbC0+bmFtZSk7CiAKLQkJCWlmICgoR0VOOV9FTkFC TEVfREM1KGRldikgfHwgU0tMX0VOQUJMRV9EQzYoZGV2KSkgJiYKLQkJCQlwb3dlcl93ZWxsLT5k YXRhID09IFNLTF9ESVNQX1BXXzIpIHsKLQkJCQllbnVtIGNzcl9zdGF0ZSBzdGF0ZTsKLQkJCQkv KiBUT0RPOiB3YWl0IGZvciBhIGNvbXBsZXRpb24gZXZlbnQgb3IKLQkJCQkgKiBzaW1pbGFyIGhl cmUgaW5zdGVhZCBvZiBidXN5Ci0JCQkJICogd2FpdGluZyB1c2luZyB3YWl0X2ZvciBmdW5jdGlv bi4KLQkJCQkgKi8KLQkJCQl3YWl0X2Zvcigoc3RhdGUgPSBpbnRlbF9jc3JfbG9hZF9zdGF0dXNf Z2V0KGRldl9wcml2KSkgIT0KLQkJCQkJCUZXX1VOSU5JVElBTElaRUQsIDEwMDApOwotCQkJCWlm IChzdGF0ZSAhPSBGV19MT0FERUQpCi0JCQkJCURSTV9FUlJPUigiQ1NSIGZpcm13YXJlIG5vdCBy ZWFkeSAoJWQpXG4iLAotCQkJCQkJCXN0YXRlKTsKLQkJCQllbHNlCi0JCQkJCWlmIChTS0xfRU5B QkxFX0RDNihkZXYpKQotCQkJCQkJc2tsX2VuYWJsZV9kYzYoZGV2X3ByaXYpOwotCQkJCQllbHNl Ci0JCQkJCQlnZW45X2VuYWJsZV9kYzUoZGV2X3ByaXYpOwotCQkJfQorCQkJaWYgKEdFTjlfRU5B QkxFX0RDNShkZXYpICYmCisJCQkJcG93ZXJfd2VsbC0+ZGF0YSA9PSBTS0xfRElTUF9QV18yKQor CQkJCQlnZW45X2VuYWJsZV9kYzUoZGV2X3ByaXYpOwogCQl9CiAJfQogCi0tIAoyLjAuMgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK