From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH] drm/amdgpu: fix fundamental suspend/resume issue Date: Wed, 10 May 2017 20:09:18 +0200 Message-ID: <1494439758-1607-1-git-send-email-deathsimple@vodafone.de> 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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKUmVpbml0 aWFsaXppbmcgdGhlIFZNIG1hbmFnZXIgZHVyaW5nIHN1c3BlbmQvcmVzdW1lIGlzIGEgdmVyeSB2 ZXJ5IGJhZAppZGVhIHNpbmNlIGFsbCB0aGUgVk1zIGFyZSBzdGlsbCBhY3RpdmUgYW5kIGtpY2tp bmcuCgpUaGlzIGNhbiBsZWFkIHRvIHJhbmRvbSBWTSBmYXVsdHMgYWZ0ZXIgcmVzdW1lIHdoZW4g bmV3IHByb2Nlc3NlcwpiZWNvbWUgdGhlIHNhbWUgY2xpZW50IElEIGFzc2lnbmVkLgoKU2lnbmVk LW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jIHwgMjIgKysrKysrKysrKysr KysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmggfCAgMSAr CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jICB8IDE1ICsrLS0tLS0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y3XzAuYyAgfCAxNSArKy0tLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OF8wLmMgIHwgMTUgKyst LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5jICB8IDE2 ICsrLS0tLS0tLS0tLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgNTQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3ZtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwppbmRleCBl ZDk3YTJlLi45ODAzMzkyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfdm0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uYwpA QCAtNzkwLDYgKzc5MCw3IEBAIHZvaWQgYW1kZ3B1X3ZtX3Jlc2V0X2lkKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LCB1bnNpZ25lZCB2bWh1YiwKIAlzdHJ1Y3QgYW1kZ3B1X3ZtX2lkX21hbmFn ZXIgKmlkX21nciA9ICZhZGV2LT52bV9tYW5hZ2VyLmlkX21nclt2bWh1Yl07CiAJc3RydWN0IGFt ZGdwdV92bV9pZCAqaWQgPSAmaWRfbWdyLT5pZHNbdm1pZF07CiAKKwlhdG9taWM2NF9zZXQoJmlk LT5vd25lciwgMCk7CiAJaWQtPmdkc19iYXNlID0gMDsKIAlpZC0+Z2RzX3NpemUgPSAwOwogCWlk LT5nd3NfYmFzZSA9IDA7CkBAIC03OTksNiArODAwLDI2IEBAIHZvaWQgYW1kZ3B1X3ZtX3Jlc2V0 X2lkKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1bnNpZ25lZCB2bWh1YiwKIH0KIAogLyoq CisgKiBhbWRncHVfdm1fcmVzZXRfYWxsX2lkIC0gcmVzZXQgVk1JRCB0byB6ZXJvCisgKgorICog QGFkZXY6IGFtZGdwdSBkZXZpY2Ugc3RydWN0dXJlCisgKgorICogUmVzZXQgVk1JRCB0byBmb3Jj ZSBmbHVzaCBvbiBuZXh0IHVzZQorICovCit2b2lkIGFtZGdwdV92bV9yZXNldF9hbGxfaWRzKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQoreworCXVuc2lnbmVkIGksIGo7CisKKwlmb3IgKGkg PSAwOyBpIDwgQU1ER1BVX01BWF9WTUhVQlM7ICsraSkgeworCQlzdHJ1Y3QgYW1kZ3B1X3ZtX2lk X21hbmFnZXIgKmlkX21nciA9CisJCQkmYWRldi0+dm1fbWFuYWdlci5pZF9tZ3JbaV07CisKKwkJ Zm9yIChqID0gMTsgaiA8IGlkX21nci0+bnVtX2lkczsgKytqKQorCQkJYW1kZ3B1X3ZtX3Jlc2V0 X2lkKGFkZXYsIGksIGopOworCX0KK30KKworLyoqCiAgKiBhbWRncHVfdm1fYm9fZmluZCAtIGZp bmQgdGhlIGJvX3ZhIGZvciBhIHNwZWNpZmljIHZtICYgYm8KICAqCiAgKiBAdm06IHJlcXVlc3Rl ZCB2bQpAQCAtMjM5Myw3ICsyNDE0LDYgQEAgdm9pZCBhbWRncHVfdm1fbWFuYWdlcl9pbml0KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCWZvciAoaSA9IDA7IGkgPCBBTURHUFVfTUFYX1JJ TkdTOyArK2kpCiAJCWFkZXYtPnZtX21hbmFnZXIuc2Vxbm9baV0gPSAwOwogCi0KIAlhdG9taWNf c2V0KCZhZGV2LT52bV9tYW5hZ2VyLnZtX3B0ZV9uZXh0X3JpbmcsIDApOwogCWF0b21pYzY0X3Nl dCgmYWRldi0+dm1fbWFuYWdlci5jbGllbnRfY291bnRlciwgMCk7CiAJc3Bpbl9sb2NrX2luaXQo JmFkZXYtPnZtX21hbmFnZXIucHJ0X2xvY2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfdm0uaAppbmRleCBhYmMwYmFiLi5kNjI1NDdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfdm0uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfdm0uaApAQCAtMjA5LDYgKzIwOSw3IEBAIGludCBhbWRncHVfdm1fZ3JhYl9pZChz dHJ1Y3QgYW1kZ3B1X3ZtICp2bSwgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogaW50IGFtZGdw dV92bV9mbHVzaChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsIHN0cnVjdCBhbWRncHVfam9iICpq b2IpOwogdm9pZCBhbWRncHVfdm1fcmVzZXRfaWQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs IHVuc2lnbmVkIHZtaHViLAogCQkJdW5zaWduZWQgdm1pZCk7Cit2b2lkIGFtZGdwdV92bV9yZXNl dF9hbGxfaWRzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KTsKIGludCBhbWRncHVfdm1fdXBk YXRlX2RpcmVjdG9yaWVzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCSBzdHJ1Y3Qg YW1kZ3B1X3ZtICp2bSk7CiBpbnQgYW1kZ3B1X3ZtX2NsZWFyX2ZyZWVkKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21j X3Y2XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192Nl8wLmMKaW5kZXggYTU3 Mjk3OS4uZDg2MDkzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21j X3Y2XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjZfMC5jCkBAIC05 NTAsMTAgKzk1MCw2IEBAIHN0YXRpYyBpbnQgZ21jX3Y2XzBfc3VzcGVuZCh2b2lkICpoYW5kbGUp CiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSAoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KiloYW5kbGU7CiAKLQlpZiAoYWRldi0+dm1fbWFuYWdlci5lbmFibGVkKSB7Ci0JCWdtY192Nl8w X3ZtX2ZpbmkoYWRldik7Ci0JCWFkZXYtPnZtX21hbmFnZXIuZW5hYmxlZCA9IGZhbHNlOwotCX0K IAlnbWNfdjZfMF9od19maW5pKGFkZXYpOwogCiAJcmV0dXJuIDA7CkBAIC05NjgsMTYgKzk2NCw5 IEBAIHN0YXRpYyBpbnQgZ21jX3Y2XzBfcmVzdW1lKHZvaWQgKmhhbmRsZSkKIAlpZiAocikKIAkJ cmV0dXJuIHI7CiAKLQlpZiAoIWFkZXYtPnZtX21hbmFnZXIuZW5hYmxlZCkgewotCQlyID0gZ21j X3Y2XzBfdm1faW5pdChhZGV2KTsKLQkJaWYgKHIpIHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAi dm0gbWFuYWdlciBpbml0aWFsaXphdGlvbiBmYWlsZWQgKCVkKS5cbiIsIHIpOwotCQkJcmV0dXJu IHI7Ci0JCX0KLQkJYWRldi0+dm1fbWFuYWdlci5lbmFibGVkID0gdHJ1ZTsKLQl9CisJYW1kZ3B1 X3ZtX3Jlc2V0X2FsbF9pZHMoYWRldik7CiAKLQlyZXR1cm4gcjsKKwlyZXR1cm4gMDsKIH0KIAog c3RhdGljIGJvb2wgZ21jX3Y2XzBfaXNfaWRsZSh2b2lkICpoYW5kbGUpCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ21jX3Y3XzAuYwppbmRleCBhOTA4M2ExLi4yNzUwZTVjIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjdfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dtY192N18wLmMKQEAgLTExMTcsMTAgKzExMTcsNiBAQCBzdGF0aWMgaW50 IGdtY192N18wX3N1c3BlbmQodm9pZCAqaGFuZGxlKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxlOwogCi0JaWYgKGFkZXYtPnZt X21hbmFnZXIuZW5hYmxlZCkgewotCQlnbWNfdjdfMF92bV9maW5pKGFkZXYpOwotCQlhZGV2LT52 bV9tYW5hZ2VyLmVuYWJsZWQgPSBmYWxzZTsKLQl9CiAJZ21jX3Y3XzBfaHdfZmluaShhZGV2KTsK IAogCXJldHVybiAwOwpAQCAtMTEzNSwxNiArMTEzMSw5IEBAIHN0YXRpYyBpbnQgZ21jX3Y3XzBf cmVzdW1lKHZvaWQgKmhhbmRsZSkKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKLQlpZiAoIWFkZXYt PnZtX21hbmFnZXIuZW5hYmxlZCkgewotCQlyID0gZ21jX3Y3XzBfdm1faW5pdChhZGV2KTsKLQkJ aWYgKHIpIHsKLQkJCWRldl9lcnIoYWRldi0+ZGV2LCAidm0gbWFuYWdlciBpbml0aWFsaXphdGlv biBmYWlsZWQgKCVkKS5cbiIsIHIpOwotCQkJcmV0dXJuIHI7Ci0JCX0KLQkJYWRldi0+dm1fbWFu YWdlci5lbmFibGVkID0gdHJ1ZTsKLQl9CisJYW1kZ3B1X3ZtX3Jlc2V0X2FsbF9pZHMoYWRldik7 CiAKLQlyZXR1cm4gcjsKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGJvb2wgZ21jX3Y3XzBfaXNf aWRsZSh2b2lkICpoYW5kbGUpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nbWNfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y4XzAuYwppbmRl eCA0YWM5OTc4Li5mNTZiNDA4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9nbWNfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OF8wLmMK QEAgLTEyMDksMTAgKzEyMDksNiBAQCBzdGF0aWMgaW50IGdtY192OF8wX3N1c3BlbmQodm9pZCAq aGFuZGxlKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVf ZGV2aWNlICopaGFuZGxlOwogCi0JaWYgKGFkZXYtPnZtX21hbmFnZXIuZW5hYmxlZCkgewotCQln bWNfdjhfMF92bV9maW5pKGFkZXYpOwotCQlhZGV2LT52bV9tYW5hZ2VyLmVuYWJsZWQgPSBmYWxz ZTsKLQl9CiAJZ21jX3Y4XzBfaHdfZmluaShhZGV2KTsKIAogCXJldHVybiAwOwpAQCAtMTIyNywx NiArMTIyMyw5IEBAIHN0YXRpYyBpbnQgZ21jX3Y4XzBfcmVzdW1lKHZvaWQgKmhhbmRsZSkKIAlp ZiAocikKIAkJcmV0dXJuIHI7CiAKLQlpZiAoIWFkZXYtPnZtX21hbmFnZXIuZW5hYmxlZCkgewot CQlyID0gZ21jX3Y4XzBfdm1faW5pdChhZGV2KTsKLQkJaWYgKHIpIHsKLQkJCWRldl9lcnIoYWRl di0+ZGV2LCAidm0gbWFuYWdlciBpbml0aWFsaXphdGlvbiBmYWlsZWQgKCVkKS5cbiIsIHIpOwot CQkJcmV0dXJuIHI7Ci0JCX0KLQkJYWRldi0+dm1fbWFuYWdlci5lbmFibGVkID0gdHJ1ZTsKLQl9 CisJYW1kZ3B1X3ZtX3Jlc2V0X2FsbF9pZHMoYWRldik7CiAKLQlyZXR1cm4gcjsKKwlyZXR1cm4g MDsKIH0KIAogc3RhdGljIGJvb2wgZ21jX3Y4XzBfaXNfaWRsZSh2b2lkICpoYW5kbGUpCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYwppbmRleCBiOWYxMWZhLi5hZThmZDkxIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjlfMC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKQEAgLTc5NywxMCArNzk3LDYgQEAgc3Rh dGljIGludCBnbWNfdjlfMF9zdXNwZW5kKHZvaWQgKmhhbmRsZSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAotCWlmIChh ZGV2LT52bV9tYW5hZ2VyLmVuYWJsZWQpIHsKLQkJZ21jX3Y5XzBfdm1fZmluaShhZGV2KTsKLQkJ YWRldi0+dm1fbWFuYWdlci5lbmFibGVkID0gZmFsc2U7Ci0JfQogCWdtY192OV8wX2h3X2Zpbmko YWRldik7CiAKIAlyZXR1cm4gMDsKQEAgLTgxNSwxNyArODExLDkgQEAgc3RhdGljIGludCBnbWNf djlfMF9yZXN1bWUodm9pZCAqaGFuZGxlKQogCWlmIChyKQogCQlyZXR1cm4gcjsKIAotCWlmICgh YWRldi0+dm1fbWFuYWdlci5lbmFibGVkKSB7Ci0JCXIgPSBnbWNfdjlfMF92bV9pbml0KGFkZXYp OwotCQlpZiAocikgewotCQkJZGV2X2VycihhZGV2LT5kZXYsCi0JCQkJInZtIG1hbmFnZXIgaW5p dGlhbGl6YXRpb24gZmFpbGVkICglZCkuXG4iLCByKTsKLQkJCXJldHVybiByOwotCQl9Ci0JCWFk ZXYtPnZtX21hbmFnZXIuZW5hYmxlZCA9IHRydWU7Ci0JfQorCWFtZGdwdV92bV9yZXNldF9hbGxf aWRzKGFkZXYpOwogCi0JcmV0dXJuIHI7CisJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBib29sIGdt Y192OV8wX2lzX2lkbGUodm9pZCAqaGFuZGxlKQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=