From: Alex Deucher Subject: [PATCH] drm/amdgpu: consolidate atom scratch reg handling for hangs Date: Fri, 21 Oct 2016 15:46:33 -0400 Message-ID: <1477079193-32725-1-git-send-email-alexander.deucher@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: Alex Deucher TW92ZSBmcm9tIGFzaWMgc3BlY2lmaWMgY29kZSB0byBjb21tb24gYXRvbSBjb2RlLgoKU2lnbmVk LW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tYmlvcy5jIHwgMTMgKysrKysrKysr KysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21iaW9zLmggfCAgMiAr KwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvY2lrLmMgICAgICAgICAgICAgfCAxNyArKyst LS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmkuYyAgICAgICAgICAg ICAgfCAxNiArKy0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMo KyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9hdG9tYmlvcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2F0b21iaW9zLmMKaW5kZXggOGU2YmY1NC4uNzZjYmIxZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21iaW9zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X2F0b21iaW9zLmMKQEAgLTE3ODQsNiArMTc4NCwxOSBAQCB2b2lk IGFtZGdwdV9hdG9tYmlvc19zY3JhdGNoX3JlZ3NfcmVzdG9yZShzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldikKIAkJV1JFRzMyKG1tQklPU19TQ1JBVENIXzAgKyBpLCBhZGV2LT5iaW9zX3NjcmF0 Y2hbaV0pOwogfQogCit2b2lkIGFtZGdwdV9hdG9tYmlvc19zY3JhdGNoX3JlZ3NfZW5naW5lX2h1 bmcoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCisJCQkJCSAgICAgIGJvb2wgaHVuZykKK3sK Kwl1MzIgdG1wID0gUlJFRzMyKG1tQklPU19TQ1JBVENIXzMpOworCisJaWYgKGh1bmcpCisJCXRt cCB8PSBBVE9NX1MzX0FTSUNfR1VJX0VOR0lORV9IVU5HOworCWVsc2UKKwkJdG1wICY9IH5BVE9N X1MzX0FTSUNfR1VJX0VOR0lORV9IVU5HOworCisJV1JFRzMyKG1tQklPU19TQ1JBVENIXzMsIHRt cCk7Cit9CisKIC8qIEF0b20gbmVlZHMgZGF0YSBpbiBsaXR0bGUgZW5kaWFuIGZvcm1hdAogICog c28gc3dhcCBhcyBhcHByb3ByaWF0ZSB3aGVuIGNvcHlpbmcgZGF0YSB0bwogICogb3IgZnJvbSBh dG9tLiBOb3RlIHRoYXQgYXRvbSBvcGVyYXRlcyBvbgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2F0b21iaW9zLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfYXRvbWJpb3MuaAppbmRleCAxNzM1NjE1Li5lNGFmYjE2IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWJpb3MuaApAQCAtMjA2LDYgKzIwNiw4 IEBAIHZvaWQgYW1kZ3B1X2F0b21iaW9zX3NjcmF0Y2hfcmVnc19sb2NrKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LCBib29sIGxvY2spOwogdm9pZCBhbWRncHVfYXRvbWJpb3Nfc2NyYXRjaF9y ZWdzX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogdm9pZCBhbWRncHVfYXRvbWJp b3Nfc2NyYXRjaF9yZWdzX3NhdmUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogdm9pZCBh bWRncHVfYXRvbWJpb3Nfc2NyYXRjaF9yZWdzX3Jlc3RvcmUoc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYpOwordm9pZCBhbWRncHVfYXRvbWJpb3Nfc2NyYXRjaF9yZWdzX2VuZ2luZV9odW5nKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAorCQkJCQkgICAgICBib29sIGh1bmcpOwogCiB2b2lk IGFtZGdwdV9hdG9tYmlvc19jb3B5X3N3YXAodTggKmRzdCwgdTggKnNyYywgdTggbnVtX2J5dGVz LCBib29sIHRvX2xlKTsKIGludCBhbWRncHVfYXRvbWJpb3NfZ2V0X21heF92ZGRjKHN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2LCB1OCB2b2x0YWdlX3R5cGUsCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9jaWsuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Np ay5jCmluZGV4IDFiNzBmOGZhLi4zMDJkZjg1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9jaWsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9jaWsuYwpA QCAtMTE4OSwxOCArMTE4OSw2IEBAIHN0YXRpYyBpbnQgY2lrX2dwdV9wY2lfY29uZmlnX3Jlc2V0 KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXJldHVybiByOwogfQogCi1zdGF0aWMgdm9p ZCBjaWtfc2V0X2Jpb3Nfc2NyYXRjaF9lbmdpbmVfaHVuZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwgYm9vbCBodW5nKQotewotCXUzMiB0bXAgPSBSUkVHMzIobW1CSU9TX1NDUkFUQ0hfMyk7 Ci0KLQlpZiAoaHVuZykKLQkJdG1wIHw9IEFUT01fUzNfQVNJQ19HVUlfRU5HSU5FX0hVTkc7Ci0J ZWxzZQotCQl0bXAgJj0gfkFUT01fUzNfQVNJQ19HVUlfRU5HSU5FX0hVTkc7Ci0KLQlXUkVHMzIo bW1CSU9TX1NDUkFUQ0hfMywgdG1wKTsKLX0KLQogLyoqCiAgKiBjaWtfYXNpY19yZXNldCAtIHNv ZnQgcmVzZXQgR1BVCiAgKgpAQCAtMTIxMywxMSArMTIwMSwxMiBAQCBzdGF0aWMgdm9pZCBjaWtf c2V0X2Jpb3Nfc2NyYXRjaF9lbmdpbmVfaHVuZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwg Ym9vbCBodQogc3RhdGljIGludCBjaWtfYXNpY19yZXNldChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKIHsKIAlpbnQgcjsKLQljaWtfc2V0X2Jpb3Nfc2NyYXRjaF9lbmdpbmVfaHVuZyhhZGV2 LCB0cnVlKTsKKworCWFtZGdwdV9hdG9tYmlvc19zY3JhdGNoX3JlZ3NfZW5naW5lX2h1bmcoYWRl diwgdHJ1ZSk7CiAKIAlyID0gY2lrX2dwdV9wY2lfY29uZmlnX3Jlc2V0KGFkZXYpOwogCi0JY2lr X3NldF9iaW9zX3NjcmF0Y2hfZW5naW5lX2h1bmcoYWRldiwgZmFsc2UpOworCWFtZGdwdV9hdG9t Ymlvc19zY3JhdGNoX3JlZ3NfZW5naW5lX2h1bmcoYWRldiwgZmFsc2UpOwogCiAJcmV0dXJuIHI7 CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92aS5jIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvdmkuYwppbmRleCBiMmExY2Y0Li41MmQwYTgzIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92aS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L3ZpLmMKQEAgLTcyOSwxOCArNzI5LDYgQEAgc3RhdGljIGludCB2aV9ncHVf cGNpX2NvbmZpZ19yZXNldChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlyZXR1cm4gLUVJ TlZBTDsKIH0KIAotc3RhdGljIHZvaWQgdmlfc2V0X2Jpb3Nfc2NyYXRjaF9lbmdpbmVfaHVuZyhz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBodW5nKQotewotCXUzMiB0bXAgPSBSUkVH MzIobW1CSU9TX1NDUkFUQ0hfMyk7Ci0KLQlpZiAoaHVuZykKLQkJdG1wIHw9IEFUT01fUzNfQVNJ Q19HVUlfRU5HSU5FX0hVTkc7Ci0JZWxzZQotCQl0bXAgJj0gfkFUT01fUzNfQVNJQ19HVUlfRU5H SU5FX0hVTkc7Ci0KLQlXUkVHMzIobW1CSU9TX1NDUkFUQ0hfMywgdG1wKTsKLX0KLQogLyoqCiAg KiB2aV9hc2ljX3Jlc2V0IC0gc29mdCByZXNldCBHUFUKICAqCkBAIC03NTQsMTEgKzc0MiwxMSBA QCBzdGF0aWMgaW50IHZpX2FzaWNfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7 CiAJaW50IHI7CiAKLQl2aV9zZXRfYmlvc19zY3JhdGNoX2VuZ2luZV9odW5nKGFkZXYsIHRydWUp OworCWFtZGdwdV9hdG9tYmlvc19zY3JhdGNoX3JlZ3NfZW5naW5lX2h1bmcoYWRldiwgdHJ1ZSk7 CiAKIAlyID0gdmlfZ3B1X3BjaV9jb25maWdfcmVzZXQoYWRldik7CiAKLQl2aV9zZXRfYmlvc19z Y3JhdGNoX2VuZ2luZV9odW5nKGFkZXYsIGZhbHNlKTsKKwlhbWRncHVfYXRvbWJpb3Nfc2NyYXRj aF9yZWdzX2VuZ2luZV9odW5nKGFkZXYsIGZhbHNlKTsKIAogCXJldHVybiByOwogfQotLSAKMi41 LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1n ZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=