From: Rex Zhu Subject: [PATCH] Revert "drm/amd/display: Match actual state during S3 resume." Date: Fri, 20 Oct 2017 18:52:19 +0800 Message-ID: <1508496739-15138-1-git-send-email-Rex.Zhu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Rex Zhu VGhpcyByZXZlcnRzIGNvbW1pdCA3YWU0YWNkMjFlOWUyNjRhZmIwNzllMjNkNDNiY2YyMjM4Yzdk YmVhLgoKZml4IHMzIGhhbmcgaXNzdWUuCgpDaGFuZ2UtSWQ6IEllZmI2MWNmODA3MmI4MzE0NmQ4 Njc5NjFiMjJmMTNhZDgzYWIwMTA2ClNpZ25lZC1vZmYtYnk6IFJleCBaaHUgPFJleC5aaHVAYW1k LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9k bS5jIHwgMzggLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzOCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1 X2RtL2FtZGdwdV9kbS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9h bWRncHVfZG0uYwppbmRleCA1OGUyOWEyLi40NTAxMTQwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMKQEAgLTY0OSwxMSArNjQ5LDYg QEAgaW50IGFtZGdwdV9kbV9kaXNwbGF5X3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dikKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBkcm1fY3J0YyAq Y3J0YzsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7Ci0Jc3RydWN0IGRtX2Ny dGNfc3RhdGUgKmRtX2NydGNfc3RhdGU7Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7Ci0Jc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7Ci0Jc3RydWN0IGRtX3BsYW5lX3N0YXRl ICpkbV9wbGFuZV9zdGF0ZTsKLQlzdHJ1Y3QgZG1fYXRvbWljX3N0YXRlICpjYWNoZWRfc3RhdGU7 CiAJaW50IHJldCA9IDA7CiAJaW50IGk7CiAKQEAgLTY4Nyw0MyArNjgyLDEwIEBAIGludCBhbWRn cHVfZG1fZGlzcGxheV9yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCWFtZGdw dV9kbV91cGRhdGVfY29ubmVjdG9yX2FmdGVyX2RldGVjdChhY29ubmVjdG9yKTsKIAkJbXV0ZXhf dW5sb2NrKCZhY29ubmVjdG9yLT5ocGRfbG9jayk7CiAJfQotCiAJLyogRm9yY2UgbW9kZSBzZXQg aW4gYXRvbWljIGNvbWl0ICovCiAJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShhZGV2LT5kbS5jYWNo ZWRfc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpCiAJCQljcnRjX3N0YXRlLT5hY3RpdmVfY2hh bmdlZCA9IHRydWU7CiAKLQljYWNoZWRfc3RhdGUgPSB0b19kbV9hdG9taWNfc3RhdGUoYWRldi0+ ZG0uY2FjaGVkX3N0YXRlKTsKLQotCS8qCi0JICogRHVyaW5nIHN1c3BlbmQsIHRoZSBjYWNoZWQg c3RhdGUgaXMgc2F2ZWQgYmVmb3JlIGFsbCBzdHJlYW1zIGFyZQotCSAqIGRpc2FibGVkLiBSZWZy ZXNoIGNhY2hlZCBzdGF0ZSB0byBtYXRjaCBhY3R1YWwgY3VycmVudCBzdGF0ZSBiZWZvcmUKLQkg KiByZXN0b3JpbmcgaXQuCi0JICovCi0JV0FSTl9PTihrcmVmX3JlYWQoJmNhY2hlZF9zdGF0ZS0+ Y29udGV4dC0+cmVmY291bnQpID4gMSk7Ci0JZGNfcmVsZWFzZV9zdGF0ZShjYWNoZWRfc3RhdGUt PmNvbnRleHQpOwotCi0JY2FjaGVkX3N0YXRlLT5jb250ZXh0ID0gZGNfY3JlYXRlX3N0YXRlKCk7 Ci0JQVNTRVJUKGNhY2hlZF9zdGF0ZS0+Y29udGV4dCk7Ci0JZGNfcmVzb3VyY2Vfc3RhdGVfY29w eV9jb25zdHJ1Y3RfY3VycmVudChhZGV2LT5kbS5kYywgY2FjaGVkX3N0YXRlLT5jb250ZXh0KTsK LQotCWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKGFkZXYtPmRtLmNhY2hlZF9zdGF0ZSwgY3J0 YywgY3J0Y19zdGF0ZSwgaSkgewotCQlkbV9jcnRjX3N0YXRlID0gdG9fZG1fY3J0Y19zdGF0ZShj cnRjX3N0YXRlKTsKLQkJaWYgKGRtX2NydGNfc3RhdGUtPnN0cmVhbSkgewotCQkJV0FSTl9PTihr cmVmX3JlYWQoJmRtX2NydGNfc3RhdGUtPnN0cmVhbS0+cmVmY291bnQpID4gMSk7Ci0JCQlkY19z dHJlYW1fcmVsZWFzZShkbV9jcnRjX3N0YXRlLT5zdHJlYW0pOwotCQkJZG1fY3J0Y19zdGF0ZS0+ c3RyZWFtID0gTlVMTDsKLQkJfQotCX0KLQotCWZvcl9lYWNoX25ld19wbGFuZV9pbl9zdGF0ZShh ZGV2LT5kbS5jYWNoZWRfc3RhdGUsIHBsYW5lLCBwbGFuZV9zdGF0ZSwgaSkgewotCQlkbV9wbGFu ZV9zdGF0ZSA9IHRvX2RtX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKTsKLQkJaWYgKGRtX3BsYW5l X3N0YXRlLT5kY19zdGF0ZSkgewotCQkJV0FSTl9PTihrcmVmX3JlYWQoJmRtX3BsYW5lX3N0YXRl LT5kY19zdGF0ZS0+cmVmY291bnQpID4gMSk7Ci0JCQlkY19wbGFuZV9zdGF0ZV9yZWxlYXNlKGRt X3BsYW5lX3N0YXRlLT5kY19zdGF0ZSk7Ci0JCQlkbV9wbGFuZV9zdGF0ZS0+ZGNfc3RhdGUgPSBO VUxMOwotCQl9Ci0JfQotCiAJcmV0ID0gZHJtX2F0b21pY19oZWxwZXJfcmVzdW1lKGRkZXYsIGFk ZXYtPmRtLmNhY2hlZF9zdGF0ZSk7CiAKIAlkcm1fYXRvbWljX3N0YXRlX3B1dChhZGV2LT5kbS5j YWNoZWRfc3RhdGUpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v YW1kLWdmeAo=