From: Roger.He Subject: [PATCH 3/3] drm/amdgpu: fix gpu reset issue Date: Fri, 21 Apr 2017 15:08:10 +0800 Message-ID: <1492758490-12631-1-git-send-email-Hongbo.He@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: david1.zhou-5C7GfCeVMHo@public.gmane.org, "Roger.He" Q2hhbmdlLUlkOiBJYjc3ZDMzYTA5ZjM0OGViZjJlM2E5ZDc4NjE0MTFmNGI5NTFlYmY3YwpTaWdu ZWQtb2ZmLWJ5OiBSb2dlci5IZSA8SG9uZ2JvLkhlQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAgICAgIHwgIDYgKysrKysrCiBkcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgfCAxNiArKysrKysrKysrKysrKystCiBkcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMgICAgfCAgNCArKysrCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfaW9jMzIuYyAgfCAgNyArKysrKystCiA0IGZpbGVz IGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaAppbmRleCA3MTM2NGY1Li5hYjBmZmE4IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHUuaApAQCAtMTUyNiw2ICsxNTI2LDcgQEAgc3RydWN0IGFtZGdwdV9kZXZp Y2UgewogCWF0b21pYzY0X3QJCQludW1fYnl0ZXNfbW92ZWQ7CiAJYXRvbWljNjRfdAkJCW51bV9l dmljdGlvbnM7CiAJYXRvbWljX3QJCQlncHVfcmVzZXRfY291bnRlcjsKKwlhdG9taWNfdAkJCWdw dV9yZXNldF9zdGF0ZTsKIAogCS8qIGRhdGEgZm9yIGJ1ZmZlciBtaWdyYXRpb24gdGhyb3R0bGlu ZyAqLwogCXN0cnVjdCB7CkBAIC0xODUxLDYgKzE4NTIsMTEgQEAgYW1kZ3B1X2dldF9zZG1hX2lu c3RhbmNlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKICNkZWZpbmUgYW1kZ3B1X3BzcF9jaGVj a19md19sb2FkaW5nX3N0YXR1cyhhZGV2LCBpKSAoYWRldiktPmZpcm13YXJlLmZ1bmNzLT5jaGVj a19md19sb2FkaW5nX3N0YXR1cygoYWRldiksIChpKSkKIAogLyogQ29tbW9uIGZ1bmN0aW9ucyAq Lworc3RhdGljIGlubGluZSBpbnQgYW1kZ3B1X2RldmljZV9pc19yZXNldChzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldikKK3sKKwlyZXR1cm4gYXRvbWljX3JlYWQoJmFkZXYtPmdwdV9yZXNldF9z dGF0ZSk7Cit9CisKIGludCBhbWRncHVfZ3B1X3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2KTsKIGJvb2wgYW1kZ3B1X25lZWRfYmFja3VwKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 KTsKIHZvaWQgYW1kZ3B1X3BjaV9jb25maWdfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rldmlj ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCmluZGV4IGY4 ODI0OTYuLjBmYjQ3MTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2 aWNlLmMKQEAgLTE4OTQsNiArMTg5NCw3IEBAIGludCBhbWRncHVfZGV2aWNlX2luaXQoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJbXV0ZXhfaW5pdCgmYWRldi0+Z3JibV9pZHhfbXV0ZXgp OwogCW11dGV4X2luaXQoJmFkZXYtPm1uX2xvY2spOwogCWhhc2hfaW5pdChhZGV2LT5tbl9oYXNo KTsKKwlhdG9taWNfc2V0KCZhZGV2LT5ncHVfcmVzZXRfc3RhdGUsIDApOwogCiAJYW1kZ3B1X2No ZWNrX2FyZ3VtZW50cyhhZGV2KTsKIApAQCAtMjY1NSw2ICsyNjU2LDE4IEBAIGludCBhbWRncHVf c3Jpb3ZfZ3B1X3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBib29sIHZvbHVudGFy eSkKIH0KIAogLyoqCisgKiBhbWRncHVfZGV2aWNlX3NldF9yZXNldF9zdGF0ZSAtIHNldCBncHUg cmVzZXQgc3RhdGUKKyAqCisgKiBAYWRldjogYW1kZ3B1IGRldmljZSBwb2ludGVyCisgKiBAc3Rh dGU6IHRydWUgd2hlbiBzdGFydCB0byByZXNldCBncHU7IGZhbHNlOiByZXNldCBkb25lCisgKi8K K3N0YXRpYyBpbmxpbmUgdm9pZCBhbWRncHVfZGV2aWNlX3NldF9yZXNldF9zdGF0ZShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCQkJCQlib29sIHN0YXRlKQoreworCWF0b21pY19zZXQo JmFkZXYtPmdwdV9yZXNldF9zdGF0ZSwgc3RhdGUpOworfQorCisvKioKICAqIGFtZGdwdV9ncHVf cmVzZXQgLSByZXNldCB0aGUgYXNpYwogICoKICAqIEBhZGV2OiBhbWRncHUgZGV2aWNlIHBvaW50 ZXIKQEAgLTI2NzgsNyArMjY5MSw3IEBAIGludCBhbWRncHVfZ3B1X3Jlc2V0KHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2KQogCX0KIAogCWF0b21pY19pbmMoJmFkZXYtPmdwdV9yZXNldF9jb3Vu dGVyKTsKLQorCWFtZGdwdV9kZXZpY2Vfc2V0X3Jlc2V0X3N0YXRlKGFkZXYsIHRydWUpOwogCS8q IGJsb2NrIFRUTSAqLwogCXJlc2NoZWQgPSB0dG1fYm9fbG9ja19kZWxheWVkX3dvcmtxdWV1ZSgm YWRldi0+bW1hbi5iZGV2KTsKIAkvKiBzdG9yZSBtb2Rlc2V0dGluZyAqLwpAQCAtMjgxMSw2ICsy ODI0LDcgQEAgaW50IGFtZGdwdV9ncHVfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiAJCWRldl9pbmZvKGFkZXYtPmRldiwgIkdQVSByZXNldCBmYWlsZWRcbiIpOwogCX0KIAorCWFt ZGdwdV9kZXZpY2Vfc2V0X3Jlc2V0X3N0YXRlKGFkZXYsIGZhbHNlKTsKIAlyZXR1cm4gcjsKIH0K IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rydi5jIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rydi5jCmluZGV4IGVhZDAwZDcuLjhj YzE0YWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcnYu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMKQEAgLTY3OSwx MSArNjc5LDE1IEBAIGxvbmcgYW1kZ3B1X2RybV9pb2N0bChzdHJ1Y3QgZmlsZSAqZmlscCwKIAlz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiA9IGZpbHAtPnByaXZhdGVfZGF0YTsKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2OwogCWxvbmcgcmV0OworCiAJZGV2ID0gZmlsZV9wcml2LT5taW5vci0+ ZGV2OwogCXJldCA9IHBtX3J1bnRpbWVfZ2V0X3N5bmMoZGV2LT5kZXYpOwogCWlmIChyZXQgPCAw KQogCQlyZXR1cm4gcmV0OwogCisJd2hpbGUgKGFtZGdwdV9kZXZpY2VfaXNfcmVzZXQoZGV2LT5k ZXZfcHJpdmF0ZSkpCisJCW1zbGVlcCgxMDApOworCiAJcmV0ID0gZHJtX2lvY3RsKGZpbHAsIGNt ZCwgYXJnKTsKIAogCXBtX3J1bnRpbWVfbWFya19sYXN0X2J1c3koZGV2LT5kZXYpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2lvYzMyLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfaW9jMzIuYwppbmRleCAyNjQ4MjkxLi4yMmI4MDU5 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfaW9jMzIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfaW9jMzIuYwpAQCAtMzYsMTAg KzM2LDE1IEBACiBsb25nIGFtZGdwdV9rbXNfY29tcGF0X2lvY3RsKHN0cnVjdCBmaWxlICpmaWxw LCB1bnNpZ25lZCBpbnQgY21kLCB1bnNpZ25lZCBsb25nIGFyZykKIHsKIAl1bnNpZ25lZCBpbnQg bnIgPSBEUk1fSU9DVExfTlIoY21kKTsKKwlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiA9IGZp bHAtPnByaXZhdGVfZGF0YTsKKwlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGZpbGVfcHJp di0+bWlub3ItPmRldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJldDsKIAotCWlmIChuciA8IERSTV9D T01NQU5EX0JBU0UpCisJaWYgKG5yIDwgRFJNX0NPTU1BTkRfQkFTRSkgeworCQl3aGlsZSAoYW1k Z3B1X2RldmljZV9pc19yZXNldChhZGV2KSkKKwkJCW1zbGVlcCgxMDApOwogCQlyZXR1cm4gZHJt X2NvbXBhdF9pb2N0bChmaWxwLCBjbWQsIGFyZyk7CisJfQogCiAJcmV0ID0gYW1kZ3B1X2RybV9p b2N0bChmaWxwLCBjbWQsIGFyZyk7CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZngK