From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tao Zhou <tao.zhou1-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 4/4] drm/amdgpu: move the call of ras recovery_init and bad
 page reserve to proper place
Date: Fri, 30 Aug 2019 20:24:53 +0800
Message-ID: <20190830122453.19703-5-tao.zhou1@amd.com>
References: <20190830122453.19703-1-tao.zhou1@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
In-Reply-To: <20190830122453.19703-1-tao.zhou1-5C7GfCeVMHo@public.gmane.org>
List-Id: Discussion list for AMD gfx <amd-gfx.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/amd-gfx>
List-Post: <mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
List-Help: <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=subscribe>
Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Sender: "amd-gfx" <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, andrey.grodzovsky-5C7GfCeVMHo@public.gmane.org, guchun.chen-5C7GfCeVMHo@public.gmane.org, dennis.li-5C7GfCeVMHo@public.gmane.org, hawking.zhang-5C7GfCeVMHo@public.gmane.org
Cc: Tao Zhou <tao.zhou1-5C7GfCeVMHo@public.gmane.org>

cmFzIHJlY292ZXJ5X2luaXQgc2hvdWxkIGJlIGNhbGxlZCBhZnRlciB0dG0gYW5kIHNtdSBpbml0
LApiYWQgcGFnZSByZXNlcnZlIHNob3VsZCBiZSBwdXQgaW4gZnJvbnQgb2YgZ3B1IHJlc2V0IHNp
bmNlIGkyYwptYXkgYmUgdW5zdGFibGUgZHVyaW5nIGdwdSByZXNldAphZGQgY2xlYW51cCBmb3Ig
cmVjb3ZlcnlfaW5pdCBhbmQgcmVjb3ZlcnlfZmluaQoKU2lnbmVkLW9mZi1ieTogVGFvIFpob3Ug
PHRhby56aG91MUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw
dV9kZXZpY2UuYyB8IDE2ICsrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1
L2FtZGdwdV9yYXMuYyAgICB8IDI4ICsrKysrKysrKysrKystLS0tLS0tLS0KIGRyaXZlcnMvZ3B1
L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yYXMuaCAgICB8ICA1ICsrKysKIDMgZmlsZXMgY2hhbmdl
ZCwgMzMgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft
ZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCmluZGV4IDY3YjA5Y2IyYTllMi4uNGU0ODk1YWM5MjZk
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCkBAIC0yODk0
LDYgKzI4OTQsMTcgQEAgaW50IGFtZGdwdV9kZXZpY2VfaW5pdChzdHJ1Y3QgYW1kZ3B1X2Rldmlj
ZSAqYWRldiwKIAkJZ290byBmYWlsZWQ7CiAJfQogCisJLyogcmV0aXJlZCBwYWdlcyB3aWxsIGJl
IGxvYWRlZCBmcm9tIGVlcHJvbSBhbmQgcmVzZXJ2ZWQgaGVyZSwKKwkgKiBuZXcgYm8gbWF5IGJl
IGNyZWF0ZWQsIGl0IHNob3VsZCBiZSBjYWxsZWQgYWZ0ZXIgdHRtIGluaXQsCisJICogYWNjZXNz
aW5nIGVlcHJvbSBhbHNvIHJlbGllcyBvbiBzbXUgKHVubG9jayBpMmMgYnVzKSBhbmQgaXQKKwkg
KiBzaG91bGQgYmUgY2FsbGVkIGFmdGVyIHNtdSBpbml0CisJICoKKwkgKiBOb3RlOiB0aGVvcmV0
aWNhbGx5LCB0aGlzIHNob3VsZCBiZSBjYWxsZWQgYmVmb3JlIGFsbCB2cmFtIGFsbG9jYXRpb25z
CisJICogdG8gcHJvdGVjdCByZXRpcmVkIHBhZ2UgZnJvbSBhYnVzaW5nLCBidXQgdGhlcmUgYXJl
IHNvbWUgYWxsb2NhdGlvbnMKKwkgKiBpbiBmcm9udCBvZiBzbXUgZncgbG9hZGluZworCSAqLwor
CWFtZGdwdV9yYXNfcmVjb3ZlcnlfaW5pdChhZGV2KTsKKwogCS8qIG11c3Qgc3VjY2VlZC4gKi8K
IAlhbWRncHVfcmFzX3Jlc3VtZShhZGV2KTsKIApAQCAtMzYyNywxMSArMzYzOCw2IEBAIHN0YXRp
YyBpbnQgYW1kZ3B1X2RvX2FzaWNfcmVzZXQoc3RydWN0IGFtZGdwdV9oaXZlX2luZm8gKmhpdmUs
CiAJCQkJCQlicmVhazsKIAkJCQl9CiAJCQl9Ci0KLQkJCWxpc3RfZm9yX2VhY2hfZW50cnkodG1w
X2FkZXYsIGRldmljZV9saXN0X2hhbmRsZSwKLQkJCQkJZ21jLnhnbWkuaGVhZCkgewotCQkJCWFt
ZGdwdV9yYXNfcmVzZXJ2ZV9iYWRfcGFnZXModG1wX2FkZXYpOwotCQkJfQogCQl9CiAJfQogCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmFzLmMgYi9kcml2
ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmFzLmMKaW5kZXggMDIxMjBhYTNjYjVkLi5h
ZDY3YTEwOTEyMmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw
dV9yYXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmFzLmMKQEAg
LTE0NzcsMTQgKzE0NzcsMTMgQEAgc3RhdGljIGludCBhbWRncHVfcmFzX3JlbGVhc2VfYmFkX3Bh
Z2VzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMg
aW50IGFtZGdwdV9yYXNfcmVjb3ZlcnlfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK
K2ludCBhbWRncHVfcmFzX3JlY292ZXJ5X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp
CiB7CiAJc3RydWN0IGFtZGdwdV9yYXMgKmNvbiA9IGFtZGdwdV9yYXNfZ2V0X2NvbnRleHQoYWRl
dik7CiAJc3RydWN0IHJhc19lcnJfaGFuZGxlcl9kYXRhICoqZGF0YSA9ICZjb24tPmVoX2RhdGE7
CiAJaW50IHJldDsKIAotCSpkYXRhID0ga21hbGxvYyhzaXplb2YoKipkYXRhKSwKLQkJCUdGUF9L
RVJORUx8X19HRlBfWkVSTyk7CisJKmRhdGEgPSBrbWFsbG9jKHNpemVvZigqKmRhdGEpLCBHRlBf
S0VSTkVMIHwgX19HRlBfWkVSTyk7CiAJaWYgKCEqZGF0YSkKIAkJcmV0dXJuIC1FTk9NRU07CiAK
QEAgLTE0OTUsMTggKzE0OTQsMjkgQEAgc3RhdGljIGludCBhbWRncHVfcmFzX3JlY292ZXJ5X2lu
aXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAKIAlyZXQgPSBhbWRncHVfcmFzX2VlcHJv
bV9pbml0KCZhZGV2LT5wc3AucmFzLnJhcy0+ZWVwcm9tX2NvbnRyb2wpOwogCWlmIChyZXQpCi0J
CXJldHVybiByZXQ7CisJCWdvdG8gY2FuY2VsX3dvcms7CiAKIAlpZiAoYWRldi0+cHNwLnJhcy5y
YXMtPmVlcHJvbV9jb250cm9sLm51bV9yZWNzKSB7CiAJCXJldCA9IGFtZGdwdV9yYXNfbG9hZF9i
YWRfcGFnZXMoYWRldik7CiAJCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OworCQkJZ290byBjYW5j
ZWxfd29yazsKIAkJcmV0ID0gYW1kZ3B1X3Jhc19yZXNlcnZlX2JhZF9wYWdlcyhhZGV2KTsKIAkJ
aWYgKHJldCkKLQkJCXJldHVybiByZXQ7CisJCQlnb3RvIHJlbGVhc2U7CiAJfQogCiAJcmV0dXJu
IDA7CisKK3JlbGVhc2U6CisJYW1kZ3B1X3Jhc19yZWxlYXNlX2JhZF9wYWdlcyhhZGV2KTsKK2Nh
bmNlbF93b3JrOgorCWNhbmNlbF93b3JrX3N5bmMoJmNvbi0+cmVjb3Zlcnlfd29yayk7CisJY29u
LT5laF9kYXRhID0gTlVMTDsKKwlrZnJlZSgoKmRhdGEpLT5icHMpOworCWtmcmVlKCgqZGF0YSkt
PmJwc19ibyk7CisJa2ZyZWUoKmRhdGEpOworCisJcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIGlu
dCBhbWRncHVfcmFzX3JlY292ZXJ5X2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCkBA
IC0xNTIwLDYgKzE1MzAsNyBAQCBzdGF0aWMgaW50IGFtZGdwdV9yYXNfcmVjb3ZlcnlfZmluaShz
dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAltdXRleF9sb2NrKCZjb24tPnJlY292ZXJ5X2xv
Y2spOwogCWNvbi0+ZWhfZGF0YSA9IE5VTEw7CiAJa2ZyZWUoZGF0YS0+YnBzKTsKKwlrZnJlZShk
YXRhLT5icHNfYm8pOwogCWtmcmVlKGRhdGEpOwogCW11dGV4X3VubG9jaygmY29uLT5yZWNvdmVy
eV9sb2NrKTsKIApAQCAtMTYxMSw5ICsxNjIyLDYgQEAgaW50IGFtZGdwdV9yYXNfaW5pdChzdHJ1
Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJCXJldHVybiByOwogCX0KIAotCWlmIChhbWRncHVf
cmFzX3JlY292ZXJ5X2luaXQoYWRldikpCi0JCWdvdG8gcmVjb3Zlcnlfb3V0OwotCiAJYW1kZ3B1
X3Jhc19tYXNrICY9IEFNREdQVV9SQVNfQkxPQ0tfTUFTSzsKIAogCWlmIChhbWRncHVfcmFzX2Zz
X2luaXQoYWRldikpCkBAIC0xNjI4LDggKzE2MzYsNiBAQCBpbnQgYW1kZ3B1X3Jhc19pbml0KHN0
cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQkJY29uLT5od19zdXBwb3J0ZWQsIGNvbi0+c3Vw
cG9ydGVkKTsKIAlyZXR1cm4gMDsKIGZzX291dDoKLQlhbWRncHVfcmFzX3JlY292ZXJ5X2Zpbmko
YWRldik7Ci1yZWNvdmVyeV9vdXQ6CiAJYW1kZ3B1X3Jhc19zZXRfY29udGV4dChhZGV2LCBOVUxM
KTsKIAlrZnJlZShjb24pOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw
dS9hbWRncHVfcmFzLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfcmFzLmgK
aW5kZXggNDJlMWQzNzllMjFjLi42ZDAwZjc5YjYxMmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yYXMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft
ZGdwdS9hbWRncHVfcmFzLmgKQEAgLTQ4MCw2ICs0ODAsNyBAQCBzdGF0aWMgaW5saW5lIGludCBh
bWRncHVfcmFzX2lzX3N1cHBvcnRlZChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlyZXR1
cm4gcmFzICYmIChyYXMtPnN1cHBvcnRlZCAmICgxIDw8IGJsb2NrKSk7CiB9CiAKK2ludCBhbWRn
cHVfcmFzX3JlY292ZXJ5X2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogaW50IGFt
ZGdwdV9yYXNfcmVxdWVzdF9yZXNldF9vbl9ib290KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2
LAogCQl1bnNpZ25lZCBpbnQgYmxvY2spOwogCkBAIC01MDAsNiArNTAxLDEwIEBAIHN0YXRpYyBp
bmxpbmUgaW50IGFtZGdwdV9yYXNfcmVzZXRfZ3B1KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2
LAogewogCXN0cnVjdCBhbWRncHVfcmFzICpyYXMgPSBhbWRncHVfcmFzX2dldF9jb250ZXh0KGFk
ZXYpOwogCisJLyogc2F2ZSBiYWQgcGFnZSB0byBlZXByb20gYmVmb3JlIGdwdSByZXNldCwKKwkg
KiBpMmMgbWF5IGJlIHVuc3RhYmxlIGluIGdwdSByZXNldAorCSAqLworCWFtZGdwdV9yYXNfcmVz
ZXJ2ZV9iYWRfcGFnZXMoYWRldik7CiAJaWYgKGF0b21pY19jbXB4Y2hnKCZyYXMtPmluX3JlY292
ZXJ5LCAwLCAxKSA9PSAwKQogCQlzY2hlZHVsZV93b3JrKCZyYXMtPnJlY292ZXJ5X3dvcmspOwog
CXJldHVybiAwOwotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr
dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft
ZC1nZng=