From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Zhang Subject: [PATCH v8] drm/amd/amdgpu:Fix compute ring unable to detect hang. Date: Fri, 20 Sep 2019 14:57:17 +0800 Message-ID: <1568962637-26150-1-git-send-email-zhexi.zhang@amd.com> References: <1568947109-5924-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: <1568947109-5924-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 V2hlbiBjb21wdXRlIGZlbmNlIGRpZCBub3Qgc2lnbmFsLCBjb21wdXRlIHJpbmcgY2Fubm90IGRl dGVjdCBoYXJkd2FyZSBoYW5nCmJlY2F1c2UgaXRzIHRpbWVvdXQgdmFsdWUgaXMgc2V0IHRvIGJl IGluZmluaXRlIGJ5IGRlZmF1bHQuCgpJbiBTUi1JT1YgYW5kIHBhc3N0aHJvdWdoIG1vZGUsIGlm IHVzZXIgZG9lcyBub3QgZGVjbGFyZSBjdXN0b21lIHRpbWVvdXQKdmFsdWUgZm9yIGNvbXB1dGUg cmluZywgdGhlbiB1c2UgZ2Z4IHJpbmcgdGltZW91dCB2YWx1ZSBhcyBkZWZhdWx0LiBTbwp0aGF0 IHdoZW4gdGhlcmUgaXMgYSB0dXJlIGhhcmR3YXJlIGhhbmcsIGNvbXB1dGUgcmluZyBjYW4gZGV0 ZWN0IGl0LgoKQ2hhbmdlLUlkOiBJNzk0ZWMwODY4YzZjMGFhZDQwNzc0OTQ1NzI2MGVjZmVlMDYx N2MxMApTaWduZWQtb2ZmLWJ5OiBKZXNzZSBaaGFuZyA8emhleGkuemhhbmdAYW1kLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgfCAxMiArKysrKyst LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcnYuYyAgICB8ICA3ICsr KysrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9mZW5jZS5jICB8IDEzICst LS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rl dmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCmluZGV4 IDNiNTI4MmIuLjAzYWM1YTFkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9kZXZpY2UuYwpAQCAtMTAyNCwxMiArMTAyNCw2IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2Rldmlj ZV9jaGVja19hcmd1bWVudHMoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAKIAlhbWRncHVf ZGV2aWNlX2NoZWNrX2Jsb2NrX3NpemUoYWRldik7CiAKLQlyZXQgPSBhbWRncHVfZGV2aWNlX2dl dF9qb2JfdGltZW91dF9zZXR0aW5ncyhhZGV2KTsKLQlpZiAocmV0KSB7Ci0JCWRldl9lcnIoYWRl di0+ZGV2LCAiaW52YWxpZCBsb2NrdXBfdGltZW91dCBwYXJhbWV0ZXIgc3ludGF4XG4iKTsKLQkJ cmV0dXJuIHJldDsKLQl9Ci0KIAlhZGV2LT5maXJtd2FyZS5sb2FkX3R5cGUgPSBhbWRncHVfdWNv ZGVfZ2V0X2xvYWRfdHlwZShhZGV2LCBhbWRncHVfZndfbG9hZF90eXBlKTsKIAogCXJldHVybiBy ZXQ7CkBAIC0yNzMyLDYgKzI3MjYsMTIgQEAgaW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwKIAlpZiAocikKIAkJcmV0dXJuIHI7CiAKKwlyID0gYW1kZ3B1 X2RldmljZV9nZXRfam9iX3RpbWVvdXRfc2V0dGluZ3MoYWRldik7CisJaWYgKHIpIHsKKwkJZGV2 X2VycihhZGV2LT5kZXYsICJpbnZhbGlkIGxvY2t1cF90aW1lb3V0IHBhcmFtZXRlciBzeW50YXhc biIpOworCQlyZXR1cm4gcjsKKwl9CisKIAkvKiBkb29yYmVsbCBiYXIgbWFwcGluZyBhbmQgZG9v cmJlbGwgaW5kZXggaW5pdCovCiAJYW1kZ3B1X2RldmljZV9kb29yYmVsbF9pbml0KGFkZXYpOwog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZHJ2LmMKaW5kZXggNDIwODg4ZS4uOThi ZTQ5YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Rydi5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kcnYuYwpAQCAtMTMzOCwx MCArMTMzOCwxNSBAQCBpbnQgYW1kZ3B1X2RldmljZV9nZXRfam9iX3RpbWVvdXRfc2V0dGluZ3Mo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJLyoKIAkgKiBCeSBkZWZhdWx0IHRpbWVvdXQg Zm9yIG5vbiBjb21wdXRlIGpvYnMgaXMgMTAwMDAuCiAJICogQW5kIHRoZXJlIGlzIG5vIHRpbWVv dXQgZW5mb3JjZWQgb24gY29tcHV0ZSBqb2JzLgorCSAqIEluIFNSLUlPViBvciBwYXNzdGhyb3Vn aCBtb2RlLCB0aW1lb3V0IGZvciBjb21wdXRlCisJICogam9icyBhcmUgMTAwMDAgYnkgZGVmYXVs dC4KIAkgKi8KIAlhZGV2LT5nZnhfdGltZW91dCA9IG1zZWNzX3RvX2ppZmZpZXMoMTAwMDApOwog CWFkZXYtPnNkbWFfdGltZW91dCA9IGFkZXYtPnZpZGVvX3RpbWVvdXQgPSBhZGV2LT5nZnhfdGlt ZW91dDsKLQlhZGV2LT5jb21wdXRlX3RpbWVvdXQgPSBNQVhfU0NIRURVTEVfVElNRU9VVDsKKwlp ZiAoYW1kZ3B1X3NyaW92X3ZmKGFkZXYpIHx8IGFtZGdwdV9wYXNzdGhyb3VnaChhZGV2KSkKKwkJ YWRldi0+Y29tcHV0ZV90aW1lb3V0ID0gYWRldi0+Z2Z4X3RpbWVvdXQ7CisJZWxzZQorCQlhZGV2 LT5jb21wdXRlX3RpbWVvdXQgPSBNQVhfU0NIRURVTEVfVElNRU9VVDsKIAogCWlmIChzdHJubGVu KGlucHV0LCBBTURHUFVfTUFYX1RJTUVPVVRfUEFSQU1fTEVOVEgpKSB7CiAJCXdoaWxlICgodGlt ZW91dF9zZXR0aW5nID0gc3Ryc2VwKCZpbnB1dCwgIiwiKSkgJiYKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9mZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X2ZlbmNlLmMKaW5kZXggY2JjYWE3Yy4uOWVmNTNjYSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZlbmNlLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ZlbmNlLmMKQEAgLTQ2MCwxOCArNDYwLDcgQEAg aW50IGFtZGdwdV9mZW5jZV9kcml2ZXJfaW5pdF9yaW5nKHN0cnVjdCBhbWRncHVfcmluZyAqcmlu ZywKIAkJCXRpbWVvdXQgPSBhZGV2LT5nZnhfdGltZW91dDsKIAkJCWJyZWFrOwogCQljYXNlIEFN REdQVV9SSU5HX1RZUEVfQ09NUFVURToKLQkJCS8qCi0JCQkgKiBGb3Igbm9uLXNyaW92IGNhc2Us IG5vIHRpbWVvdXQgZW5mb3JjZQotCQkJICogb24gY29tcHV0ZSByaW5nIGJ5IGRlZmF1bHQuIFVu bGVzcyB1c2VyCi0JCQkgKiBzcGVjaWZpZXMgYSB0aW1lb3V0IGZvciBjb21wdXRlIHJpbmcuCi0J CQkgKgotCQkJICogRm9yIHNyaW92IGNhc2UsIGFsd2F5cyB1c2UgdGhlIHRpbWVvdXQKLQkJCSAq IGFzIGdmeCByaW5nCi0JCQkgKi8KLQkJCWlmICghYW1kZ3B1X3NyaW92X3ZmKHJpbmctPmFkZXYp KQotCQkJCXRpbWVvdXQgPSBhZGV2LT5jb21wdXRlX3RpbWVvdXQ7Ci0JCQllbHNlCi0JCQkJdGlt ZW91dCA9IGFkZXYtPmdmeF90aW1lb3V0OworCQkJdGltZW91dCA9IGFkZXYtPmNvbXB1dGVfdGlt ZW91dDsKIAkJCWJyZWFrOwogCQljYXNlIEFNREdQVV9SSU5HX1RZUEVfU0RNQToKIAkJCXRpbWVv dXQgPSBhZGV2LT5zZG1hX3RpbWVvdXQ7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9hbWQtZ2Z4