From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Zhang Subject: [PATCH v6] drm/amd/amdgpu:Fix compute ring unable to detect hang. Date: Fri, 20 Sep 2019 10:36:19 +0800 Message-ID: <1568946979-5824-1-git-send-email-zhexi.zhang@amd.com> References: <1568880041-19830-1-git-send-email-zhexi.zhang@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1568880041-19830-1-git-send-email-zhexi.zhang-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: Jesse Zhang V2hlbiBjb21wdXRlIGZlbmNlIGRpZCBzaWduYWwsIGNvbXB1dGUgcmluZyBjYW5ub3QgZGV0ZWN0 IGhhcmR3YXJlIGhhbmcKYmVjYXVzZSBpdHMgdGltZW91dCB2YWx1ZSBpcyBzZXQgdG8gYmUgaW5m aW5pdGUgYnkgZGVmYXVsdC4KCkluIFNSLUlPViBhbmQgcGFzc3Rocm91Z2ggbW9kZSwgaWYgdXNl ciBkb2VzIG5vdCBkZWNsYXJlIGN1c3RvbWUgdGltZW91dAp2YWx1ZSBmb3IgY29tcHV0ZSByaW5n LCB0aGVuIHVzZSBnZnggcmluZyB0aW1lb3V0IHZhbHVlIGFzIGRlZmF1bHQuIFNvCnRoYXQgd2hl biB0aGVyZSBpcyBhIHR1cmUgaGFyZHdhcmUgaGFuZywgY29tcHV0ZSByaW5nIGNhbiBkZXRlY3Qg aXQuCgpDaGFuZ2UtSWQ6IEk3OTRlYzA4NjhjNmMwYWFkNDA3NzQ5NDU3MjYwZWNmZWUwNjE3YzEw ClNpZ25lZC1vZmYtYnk6IEplc3NlIFpoYW5nIDx6aGV4aS56aGFuZ0BhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyB8IDEyICsrKysrKy0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rydi5jICAgIHwgIDQgKysrLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZlbmNlLmMgIHwgMTMgKy0tLS0tLS0t LS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKaW5kZXggM2I1Mjgy Yi4uMDNhYzVhMWRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rldmlj ZS5jCkBAIC0xMDI0LDEyICsxMDI0LDYgQEAgc3RhdGljIGludCBhbWRncHVfZGV2aWNlX2NoZWNr X2FyZ3VtZW50cyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAogCWFtZGdwdV9kZXZpY2Vf Y2hlY2tfYmxvY2tfc2l6ZShhZGV2KTsKIAotCXJldCA9IGFtZGdwdV9kZXZpY2VfZ2V0X2pvYl90 aW1lb3V0X3NldHRpbmdzKGFkZXYpOwotCWlmIChyZXQpIHsKLQkJZGV2X2VycihhZGV2LT5kZXYs ICJpbnZhbGlkIGxvY2t1cF90aW1lb3V0IHBhcmFtZXRlciBzeW50YXhcbiIpOwotCQlyZXR1cm4g cmV0OwotCX0KLQogCWFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSA9IGFtZGdwdV91Y29kZV9nZXRf bG9hZF90eXBlKGFkZXYsIGFtZGdwdV9md19sb2FkX3R5cGUpOwogCiAJcmV0dXJuIHJldDsKQEAg LTI3MzIsNiArMjcyNiwxMiBAQCBpbnQgYW1kZ3B1X2RldmljZV9pbml0KHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LAogCWlmIChyKQogCQlyZXR1cm4gcjsKIAorCXIgPSBhbWRncHVfZGV2aWNl X2dldF9qb2JfdGltZW91dF9zZXR0aW5ncyhhZGV2KTsKKwlpZiAocikgeworCQlkZXZfZXJyKGFk ZXYtPmRldiwgImludmFsaWQgbG9ja3VwX3RpbWVvdXQgcGFyYW1ldGVyIHN5bnRheFxuIik7CisJ CXJldHVybiByOworCX0KKwogCS8qIGRvb3JiZWxsIGJhciBtYXBwaW5nIGFuZCBkb29yYmVsbCBp bmRleCBpbml0Ki8KIAlhbWRncHVfZGV2aWNlX2Rvb3JiZWxsX2luaXQoYWRldik7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcnYuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcnYuYwppbmRleCA0MjA4ODhlLi4xMjM2MjQ1IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rydi5jCkBAIC0xMzc4LDEwICsxMzc4 LDEyIEBAIGludCBhbWRncHVfZGV2aWNlX2dldF9qb2JfdGltZW91dF9zZXR0aW5ncyhzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldikKIAkJfQogCQkvKgogCQkgKiBUaGVyZSBpcyBvbmx5IG9uZSB2 YWx1ZSBzcGVjaWZpZWQgYW5kCi0JCSAqIGl0IHNob3VsZCBhcHBseSB0byBhbGwgbm9uLWNvbXB1 dGUgam9icy4KKwkJICogaXQgc2hvdWxkIGFwcGx5IHRvIGFsbCBqb2JzLgogCQkgKi8KIAkJaWYg KGluZGV4ID09IDEpCiAJCQlhZGV2LT5zZG1hX3RpbWVvdXQgPSBhZGV2LT52aWRlb190aW1lb3V0 ID0gYWRldi0+Z2Z4X3RpbWVvdXQ7CisJCQlpZiAoYW1kZ3B1X3NyaW92X3ZmKGFkZXYpIHx8IGFt ZGdwdV9wYXNzdGhyb3VnaChhZGV2KSkKKwkJCQlhZGV2LT5jb21wdXRlX3RpbWVvdXQgPSBhZGV2 LT5nZnhfdGltZW91dDsKIAl9CiAKIAlyZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZlbmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfZmVuY2UuYwppbmRleCBjYmNhYTdjLi45ZWY1M2NhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZmVuY2UuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZmVuY2UuYwpAQCAtNDYwLDE4ICs0NjAsNyBAQCBpbnQg YW1kZ3B1X2ZlbmNlX2RyaXZlcl9pbml0X3Jpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAog CQkJdGltZW91dCA9IGFkZXYtPmdmeF90aW1lb3V0OwogCQkJYnJlYWs7CiAJCWNhc2UgQU1ER1BV X1JJTkdfVFlQRV9DT01QVVRFOgotCQkJLyoKLQkJCSAqIEZvciBub24tc3Jpb3YgY2FzZSwgbm8g dGltZW91dCBlbmZvcmNlCi0JCQkgKiBvbiBjb21wdXRlIHJpbmcgYnkgZGVmYXVsdC4gVW5sZXNz IHVzZXIKLQkJCSAqIHNwZWNpZmllcyBhIHRpbWVvdXQgZm9yIGNvbXB1dGUgcmluZy4KLQkJCSAq Ci0JCQkgKiBGb3Igc3Jpb3YgY2FzZSwgYWx3YXlzIHVzZSB0aGUgdGltZW91dAotCQkJICogYXMg Z2Z4IHJpbmcKLQkJCSAqLwotCQkJaWYgKCFhbWRncHVfc3Jpb3ZfdmYocmluZy0+YWRldikpCi0J CQkJdGltZW91dCA9IGFkZXYtPmNvbXB1dGVfdGltZW91dDsKLQkJCWVsc2UKLQkJCQl0aW1lb3V0 ID0gYWRldi0+Z2Z4X3RpbWVvdXQ7CisJCQl0aW1lb3V0ID0gYWRldi0+Y29tcHV0ZV90aW1lb3V0 OwogCQkJYnJlYWs7CiAJCWNhc2UgQU1ER1BVX1JJTkdfVFlQRV9TRE1BOgogCQkJdGltZW91dCA9 IGFkZXYtPnNkbWFfdGltZW91dDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZng=