From: Huang Rui Subject: Re: [PATCH 2/6] drm/amdgpu: cleanup GPU recovery check a bit Date: Thu, 23 Aug 2018 10:54:48 +0800 Message-ID: <20180823025445.GA20254@hr-amur2> References: <20180822100457.52546-1-christian.koenig@amd.com> <20180822100457.52546-2-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20180822100457.52546-2-christian.koenig-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: Christian =?iso-8859-1?Q?K=F6nig?= Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org T24gV2VkLCBBdWcgMjIsIDIwMTggYXQgMTI6MDQ6NTNQTSArMDIwMCwgQ2hyaXN0aWFuIEvDtm5p ZyB3cm90ZToKPiBDaGVjayBpZiB3ZSBzaG91bGQgY2FsbCB0aGUgZnVuY3Rpb24gaW5zdGVhZCBv ZiBwcm92aWRpbmcgdGhlIGZvcmNlZAo+IGZsYWcuCj4gCj4gU2lnbmVkLW9mZi1ieTogQ2hyaXN0 aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAgICAgICAgfCAgMyArKy0KPiAgZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jIHwgMzggKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9mZW5jZS5jICB8 ICAyICstCj4gIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9pcnEuYyAgICB8ICA0 ICsrLS0KPiAgZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2pvYi5jICAgIHwgIDMg KystCj4gIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L214Z3B1X2FpLmMgICAgICB8ICA0ICsr LS0KPiAgZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbXhncHVfdmkuYyAgICAgIHwgIDMgKyst Cj4gIDcgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCj4g Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKPiBpbmRleCAxOWVmNzcxMWQ5NDQuLjM0 MGU0MGQwM2Q1NCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHUuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCj4gQEAgLTEx NTgsOCArMTE1OCw5IEBAIGludCBlbXVfc29jX2FzaWNfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldik7Cj4gICNkZWZpbmUgYW1kZ3B1X2FzaWNfbmVlZF9mdWxsX3Jlc2V0KGFkZXYpIChh ZGV2KS0+YXNpY19mdW5jcy0+bmVlZF9mdWxsX3Jlc2V0KChhZGV2KSkKPiAgCj4gIC8qIENvbW1v biBmdW5jdGlvbnMgKi8KPiArYm9vbCBhbWRncHVfZGV2aWNlX3Nob3VsZF9yZWNvdmVyX2dwdShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7Cj4gIGludCBhbWRncHVfZGV2aWNlX2dwdV9yZWNv dmVyKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAo+IC0JCQkgICAgICBzdHJ1Y3QgYW1kZ3B1 X2pvYiogam9iLCBib29sIGZvcmNlKTsKPiArCQkJICAgICAgc3RydWN0IGFtZGdwdV9qb2IqIGpv Yik7Cj4gIHZvaWQgYW1kZ3B1X2RldmljZV9wY2lfY29uZmlnX3Jlc2V0KHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2KTsKPiAgYm9vbCBhbWRncHVfZGV2aWNlX25lZWRfcG9zdChzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldik7Cj4gIAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfZGV2aWNlLmMKPiBpbmRleCBjMjMzMzlkOGFlMmQuLjlmNWU0YmU3NmQ1ZSAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKPiBAQCAtMzI0NCwzMiAr MzI0NCw0NCBAQCBzdGF0aWMgaW50IGFtZGdwdV9kZXZpY2VfcmVzZXRfc3Jpb3Yoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsCj4gIAlyZXR1cm4gcjsKPiAgfQo+ICAKPiArLyoqCj4gKyAqIGFt ZGdwdV9kZXZpY2Vfc2hvdWxkX3JlY292ZXJfZ3B1IC0gY2hlY2sgaWYgd2Ugc2hvdWxkIHRyeSBH UFUgcmVjb3ZlcnkKPiArICoKPiArICogQGFkZXY6IGFtZGdwdSBkZXZpY2UgcG9pbnRlcgo+ICsg Kgo+ICsgKiBDaGVjayBhbWRncHVfZ3B1X3JlY292ZXJ5IGFuZCBTUklPViBzdGF0dXMgdG8gc2Vl IGlmIHdlIHNob3VsZCB0cnkgdG8gcmVjb3Zlcgo+ICsgKiBhIGh1bmcgR1BVLgo+ICsgKi8KPiAr Ym9vbCBhbWRncHVfZGV2aWNlX3Nob3VsZF9yZWNvdmVyX2dwdShzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldikKPiArewo+ICsJaWYgKCFhbWRncHVfZGV2aWNlX2lwX2NoZWNrX3NvZnRfcmVzZXQo YWRldikpIHsKPiArCQlEUk1fSU5GTygiVGltZW91dCwgYnV0IG5vIGhhcmR3YXJlIGhhbmcgZGV0 ZWN0ZWQuXG4iKTsKPiArCQlyZXR1cm4gZmFsc2U7Cj4gKwl9Cj4gKwo+ICsJaWYgKGFtZGdwdV9n cHVfcmVjb3ZlcnkgPT0gMCB8fCAoYW1kZ3B1X2dwdV9yZWNvdmVyeSA9PSAtMSAgJiYKPiArCQkJ CQkgIWFtZGdwdV9zcmlvdl92ZihhZGV2KSkpIHsKPiArCQlEUk1fSU5GTygiR1BVIHJlY292ZXJ5 IGRpc2FibGVkLlxuIik7Cj4gKwkJcmV0dXJuIGZhbHNlOwo+ICsJfQo+ICsKPiArCXJldHVybiB0 cnVlOwo+ICt9Cj4gKwo+ICAvKioKPiAgICogYW1kZ3B1X2RldmljZV9ncHVfcmVjb3ZlciAtIHJl c2V0IHRoZSBhc2ljIGFuZCByZWNvdmVyIHNjaGVkdWxlcgo+ICAgKgo+ICAgKiBAYWRldjogYW1k Z3B1IGRldmljZSBwb2ludGVyCj4gICAqIEBqb2I6IHdoaWNoIGpvYiB0cmlnZ2VyIGhhbmcKPiAt ICogQGZvcmNlOiBmb3JjZXMgcmVzZXQgcmVnYXJkbGVzcyBvZiBhbWRncHVfZ3B1X3JlY292ZXJ5 Cj4gICAqCj4gICAqIEF0dGVtcHQgdG8gcmVzZXQgdGhlIEdQVSBpZiBpdCBoYXMgaHVuZyAoYWxs IGFzaWNzKS4KPiAgICogUmV0dXJucyAwIGZvciBzdWNjZXNzIG9yIGFuIGVycm9yIG9uIGZhaWx1 cmUuCj4gICAqLwo+ICBpbnQgYW1kZ3B1X2RldmljZV9ncHVfcmVjb3ZlcihzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiwKPiAtCQkJICAgICAgc3RydWN0IGFtZGdwdV9qb2IgKmpvYiwgYm9vbCBm b3JjZSkKPiArCQkJICAgICAgc3RydWN0IGFtZGdwdV9qb2IgKmpvYikKPiAgewoKSW4gbXkgdmll dywgYWN0dWFsbHksIHdlIGRvbid0IG5lZWQgcmV0dXJuIGFzICJpbnQiIGZvciB0aGlzIGZ1bmN0 aW9uLgpCZWNhdXNlLCBubyBjYWxsaW5nIGlzIHRvIGNoZWNrIHRoZSByZXR1cm4gdmFsdWUuCgpP dGhlcnMgbG9va3MgZ29vZCBmb3IgbWUuClJldmlld2VkLWJ5OiBIdWFuZyBSdWkgPHJheS5odWFu Z0BhbWQuY29tPgoKPiAgCWludCBpLCByLCByZXNjaGVkOwo+ICAKPiAtCWlmICghZm9yY2UgJiYg IWFtZGdwdV9kZXZpY2VfaXBfY2hlY2tfc29mdF9yZXNldChhZGV2KSkgewo+IC0JCURSTV9JTkZP KCJObyBoYXJkd2FyZSBoYW5nIGRldGVjdGVkLiBEaWQgc29tZSBibG9ja3Mgc3RhbGw/XG4iKTsK PiAtCQlyZXR1cm4gMDsKPiAtCX0KPiAtCj4gLQlpZiAoIWZvcmNlICYmIChhbWRncHVfZ3B1X3Jl Y292ZXJ5ID09IDAgfHwKPiAtCQkJKGFtZGdwdV9ncHVfcmVjb3ZlcnkgPT0gLTEgICYmICFhbWRn cHVfc3Jpb3ZfdmYoYWRldikpKSkgewo+IC0JCURSTV9JTkZPKCJHUFUgcmVjb3ZlcnkgZGlzYWJs ZWQuXG4iKTsKPiAtCQlyZXR1cm4gMDsKPiAtCX0KPiAtCj4gIAlkZXZfaW5mbyhhZGV2LT5kZXYs ICJHUFUgcmVzZXQgYmVnaW4hXG4iKTsKPiAgCj4gIAltdXRleF9sb2NrKCZhZGV2LT5sb2NrX3Jl c2V0KTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Zl bmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZmVuY2UuYwo+IGluZGV4 IGU3NGQ2MjBkOTY5OS4uNjhjY2NlYmI4NDYzIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9mZW5jZS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2ZlbmNlLmMKPiBAQCAtNzAyLDcgKzcwMiw3IEBAIHN0YXRpYyBpbnQgYW1k Z3B1X2RlYnVnZnNfZ3B1X3JlY292ZXIoc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQo+ ICAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICAKPiAg CXNlcV9wcmludGYobSwgImdwdSByZWNvdmVyXG4iKTsKPiAtCWFtZGdwdV9kZXZpY2VfZ3B1X3Jl Y292ZXIoYWRldiwgTlVMTCwgdHJ1ZSk7Cj4gKwlhbWRncHVfZGV2aWNlX2dwdV9yZWNvdmVyKGFk ZXYsIE5VTEwpOwo+ICAKPiAgCXJldHVybiAwOwo+ICB9Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9pcnEuYwo+IGluZGV4IDFhYmY1YjViYWM5ZS4uYjkyN2U4Nzk4NTM0IDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9pcnEuYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9pcnEuYwo+IEBAIC0xMDUsOCArMTA1 LDggQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2lycV9yZXNldF93b3JrX2Z1bmMoc3RydWN0IHdvcmtf c3RydWN0ICp3b3JrKQo+ICAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBjb250YWluZXJf b2Yod29yaywgc3RydWN0IGFtZGdwdV9kZXZpY2UsCj4gIAkJCQkJCSAgcmVzZXRfd29yayk7Cj4g IAo+IC0JaWYgKCFhbWRncHVfc3Jpb3ZfdmYoYWRldikpCj4gLQkJYW1kZ3B1X2RldmljZV9ncHVf cmVjb3ZlcihhZGV2LCBOVUxMLCBmYWxzZSk7Cj4gKwlpZiAoIWFtZGdwdV9zcmlvdl92ZihhZGV2 KSAmJiBhbWRncHVfZGV2aWNlX3Nob3VsZF9yZWNvdmVyX2dwdShhZGV2KSkKPiArCQlhbWRncHVf ZGV2aWNlX2dwdV9yZWNvdmVyKGFkZXYsIE5VTEwpOwo+ICB9Cj4gIAo+ICAvKioKPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2pvYi5jIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2pvYi5jCj4gaW5kZXggMzkxZTJmN2MwM2FhLi4yNjVm ZjkwZjRlMDEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2pvYi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2pvYi5jCj4g QEAgLTM3LDcgKzM3LDggQEAgc3RhdGljIHZvaWQgYW1kZ3B1X2pvYl90aW1lZG91dChzdHJ1Y3Qg ZHJtX3NjaGVkX2pvYiAqc19qb2IpCj4gIAkJICBqb2ItPmJhc2Uuc2NoZWQtPm5hbWUsIGF0b21p Y19yZWFkKCZyaW5nLT5mZW5jZV9kcnYubGFzdF9zZXEpLAo+ICAJCSAgcmluZy0+ZmVuY2VfZHJ2 LnN5bmNfc2VxKTsKPiAgCj4gLQlhbWRncHVfZGV2aWNlX2dwdV9yZWNvdmVyKHJpbmctPmFkZXYs IGpvYiwgZmFsc2UpOwo+ICsJaWYgKGFtZGdwdV9kZXZpY2Vfc2hvdWxkX3JlY292ZXJfZ3B1KHJp bmctPmFkZXYpKQo+ICsJCWFtZGdwdV9kZXZpY2VfZ3B1X3JlY292ZXIocmluZy0+YWRldiwgam9i KTsKPiAgfQo+ICAKPiAgaW50IGFtZGdwdV9qb2JfYWxsb2Moc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYsIHVuc2lnbmVkIG51bV9pYnMsCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L214Z3B1X2FpLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9teGdwdV9h aS5jCj4gaW5kZXggMDc4ZjcwZmFlZGNiLi44Y2JiNDY1NTg5NmEgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbXhncHVfYWkuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L214Z3B1X2FpLmMKPiBAQCAtMjY2LDggKzI2Niw4IEBAIHN0YXRpYyB2b2lk IHhncHVfYWlfbWFpbGJveF9mbHJfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gIAl9 Cj4gIAo+ICAJLyogVHJpZ2dlciByZWNvdmVyeSBmb3Igd29ybGQgc3dpdGNoIGZhaWx1cmUgaWYg bm8gVERSICovCj4gLQlpZiAoYW1kZ3B1X2xvY2t1cF90aW1lb3V0ID09IDApCj4gLQkJYW1kZ3B1 X2RldmljZV9ncHVfcmVjb3ZlcihhZGV2LCBOVUxMLCB0cnVlKTsKPiArCWlmIChhbWRncHVfZGV2 aWNlX3Nob3VsZF9yZWNvdmVyX2dwdShhZGV2KSkKPiArCQlhbWRncHVfZGV2aWNlX2dwdV9yZWNv dmVyKGFkZXYsIE5VTEwpOwo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IHhncHVfYWlfc2V0X21haWxi b3hfcmN2X2lycShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbXhncHVfdmkuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L214Z3B1X3ZpLmMKPiBpbmRleCA5ZmMxYzM3MzQ0Y2UuLjg0MjU2N2I1M2RmNSAxMDA2 NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9teGdwdV92aS5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvbXhncHVfdmkuYwo+IEBAIC01MjEsNyArNTIxLDgg QEAgc3RhdGljIHZvaWQgeGdwdV92aV9tYWlsYm94X2Zscl93b3JrKHN0cnVjdCB3b3JrX3N0cnVj dCAqd29yaykKPiAgCX0KPiAgCj4gIAkvKiBUcmlnZ2VyIHJlY292ZXJ5IGR1ZSB0byB3b3JsZCBz d2l0Y2ggZmFpbHVyZSAqLwo+IC0JYW1kZ3B1X2RldmljZV9ncHVfcmVjb3ZlcihhZGV2LCBOVUxM LCBmYWxzZSk7Cj4gKwlpZiAoYW1kZ3B1X2RldmljZV9zaG91bGRfcmVjb3Zlcl9ncHUoYWRldikp Cj4gKwkJYW1kZ3B1X2RldmljZV9ncHVfcmVjb3ZlcihhZGV2LCBOVUxMKTsKPiAgfQo+ICAKPiAg c3RhdGljIGludCB4Z3B1X3ZpX3NldF9tYWlsYm94X3Jjdl9pcnEoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCj4gLS0gCj4gMi4xNC4xCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KPiBhbWQtZ2Z4IG1haWxpbmcgbGlzdAo+IGFtZC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9hbWQtZ2Z4Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdm eAo=