From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harry Wentland Subject: [PATCH 16/16] drm/amd/display: Fix s3 hang on resume. Date: Mon, 3 Apr 2017 19:07:30 -0400 Message-ID: <20170403230730.9884-17-harry.wentland@amd.com> References: <20170403230730.9884-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170403230730.9884-1-harry.wentland-5C7GfCeVMHo@public.gmane.org> 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: Andrey Grodzovsky RnJvbTogQW5kcmV5IEdyb2R6b3Zza3kgPEFuZHJleS5Hcm9kem92c2t5QGFtZC5jb20+CgpBdm9p ZCBlbmFibGluZyBDUlRDX1ZFUlRJQ0FMX0lOVEVSUlVQVDAgdHdpY2Ugb24gcmVzdW1lLgpJdCdz IGVuYWJsZWQgb25jZSBmcm9tIHdpdGhpbiBtYW5hZ2VfZG1faW50ZXJydXB0cyBpbiBtb2RlIHNl dAphbmQgYW5vdGhlciBleHBsaWNpdGx5IGZyb20gYW1kZ3B1X2RtX2lycV9yZXN1bWVfbGF0ZS4K U2VlbXMgaXQgbGVhZCB0byBDUlRDIGhhbmcuCgpDaGFuZ2UtSWQ6IEk3ZDdmMjlhZGIwZjIwNGZk NmIxYjJhOWIzNjExMWNkMmNmNWJmODIwClNpZ25lZC1vZmYtYnk6IEFuZHJleSBHcm9kem92c2t5 IDxBbmRyZXkuR3JvZHpvdnNreUBhbWQuY29tPgpBY2tlZC1ieTogSGFycnkgV2VudGxhbmQgPEhh cnJ5LldlbnRsYW5kQGFtZC5jb20+ClJldmlld2VkLWJ5OiBBbmRyZXkgR3JvZHpvdnNreSA8QW5k cmV5Lkdyb2R6b3Zza3lAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv YW1kZ3B1X2RtL2FtZGdwdV9kbS5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9pcnEuYyB8IDE2ICsrKysrKysrKysrLS0tLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtX2lycS5oIHwgIDIg Ky0KIDMgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9k bS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYwpp bmRleCBiM2E5YTkwNThjNGEuLjYyYmUxNTliMWVhNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCkBAIC01ODEsNyArNTgxLDcgQEAg aW50IGFtZGdwdV9kbV9kaXNwbGF5X3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiAp CiAKIAlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9yZXN1bWUoZGRldiwgYWRldi0+ZG0uY2FjaGVk X3N0YXRlKTsKIAotCWFtZGdwdV9kbV9pcnFfcmVzdW1lKGFkZXYpOworCWFtZGdwdV9kbV9pcnFf cmVzdW1lX2xhdGUoYWRldik7CiAKIAlyZXR1cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1faXJxLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV9pcnEuYwppbmRleCA2ODJl OWMzYWQ4ZTUuLjRhZWUxNDZhODQ4ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1faXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG1faXJxLmMKQEAgLTUwNCw4ICs1MDQsMTEgQEAg aW50IGFtZGdwdV9kbV9pcnFfc3VzcGVuZCgKIAogCURSTV9ERUJVR19LTVMoIkRNX0lSUTogc3Vz cGVuZFxuIik7CiAKLQkvKiBkaXNhYmxlIEhXIGludGVycnVwdCAqLwotCWZvciAoc3JjID0gRENf SVJRX1NPVVJDRV9IUEQxOyBzcmMgPCBEQUxfSVJRX1NPVVJDRVNfTlVNQkVSOyBzcmMrKykgewor CS8qKgorCSAqIERpc2FibGUgSFcgaW50ZXJydXB0ICBmb3IgSFBEIGFuZCBIUERSWCBvbmx5IHNp bmNlIEZMSVAgYW5kIFZCTEFOSworCSAqIHdpbGwgYmUgZGlzYWJsZWQgZnJvbSBtYW5hZ2VfZG1f aW50ZXJydXB0cyBvbiBkaXNhYmxlIENSVEMuCisJICovCisJZm9yIChzcmMgPSBEQ19JUlFfU09V UkNFX0hQRDE7IHNyYyA8IERDX0lSUV9TT1VSQ0VfSFBENlJYOyBzcmMrKykgewogCQlobmRfbGlz dF9sID0gJmFkZXYtPmRtLmlycV9oYW5kbGVyX2xpc3RfbG93X3RhYltzcmNdLmhlYWQ7CiAJCWhu ZF9saXN0X2ggPSAmYWRldi0+ZG0uaXJxX2hhbmRsZXJfbGlzdF9oaWdoX3RhYltzcmNdOwogCQlp ZiAoIWxpc3RfZW1wdHkoaG5kX2xpc3RfbCkgfHwgIWxpc3RfZW1wdHkoaG5kX2xpc3RfaCkpCkBA IC01NDQsNyArNTQ3LDcgQEAgaW50IGFtZGdwdV9kbV9pcnFfcmVzdW1lX2Vhcmx5KHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2KQogCXJldHVybiAwOwogfQogCi1pbnQgYW1kZ3B1X2RtX2lycV9y ZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCitpbnQgYW1kZ3B1X2RtX2lycV9yZXN1 bWVfbGF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlpbnQgc3JjOwogCXN0cnVj dCBsaXN0X2hlYWQgKmhuZF9saXN0X2gsICpobmRfbGlzdF9sOwpAQCAtNTU0LDggKzU1NywxMSBA QCBpbnQgYW1kZ3B1X2RtX2lycV9yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAK IAlEUk1fREVCVUdfS01TKCJETV9JUlE6IHJlc3VtZVxuIik7CiAKLQkvKiByZS1lbmFibGUgSFcg aW50ZXJydXB0ICovCi0JZm9yIChzcmMgPSBEQ19JUlFfU09VUkNFX0hQRDE7IHNyYyA8IERBTF9J UlFfU09VUkNFU19OVU1CRVI7IHNyYysrKSB7CisJLyoqCisJICogUmVuYWJsZSBIVyBpbnRlcnJ1 cHQgIGZvciBIUEQgYW5kIG9ubHkgc2luY2UgRkxJUCBhbmQgVkJMQU5LCisJICogd2lsbCBiZSBl bmFibGVkIGZyb20gbWFuYWdlX2RtX2ludGVycnVwdHMgb24gZW5hYmxlIENSVEMuCisJICovCisJ Zm9yIChzcmMgPSBEQ19JUlFfU09VUkNFX0hQRDE7IHNyYyA8IERDX0lSUV9TT1VSQ0VfSFBENjsg c3JjKyspIHsKIAkJaG5kX2xpc3RfbCA9ICZhZGV2LT5kbS5pcnFfaGFuZGxlcl9saXN0X2xvd190 YWJbc3JjXS5oZWFkOwogCQlobmRfbGlzdF9oID0gJmFkZXYtPmRtLmlycV9oYW5kbGVyX2xpc3Rf aGlnaF90YWJbc3JjXTsKIAkJaWYgKCFsaXN0X2VtcHR5KGhuZF9saXN0X2wpIHx8ICFsaXN0X2Vt cHR5KGhuZF9saXN0X2gpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5 L2FtZGdwdV9kbS9hbWRncHVfZG1faXJxLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv YW1kZ3B1X2RtL2FtZGdwdV9kbV9pcnEuaAppbmRleCA5MzM5ODYxYzg4OTcuLjlkMzAwNzYzNDI2 NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRn cHVfZG1faXJxLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9h bWRncHVfZG1faXJxLmgKQEAgLTExNyw2ICsxMTcsNiBAQCBpbnQgYW1kZ3B1X2RtX2lycV9zdXNw ZW5kKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKICAqCiAgKi8KIGludCBhbWRncHVfZG1f aXJxX3Jlc3VtZV9lYXJseShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7Ci1pbnQgYW1kZ3B1 X2RtX2lycV9yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOworaW50IGFtZGdwdV9k bV9pcnFfcmVzdW1lX2xhdGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogCiAjZW5kaWYg LyogX19BTURHUFVfRE1fSVJRX0hfXyAqLwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZngK