From: Monk Liu Subject: [PATCH 6/6] drm/amdgpu: cleanup SA inti and fini(v2) Date: Tue, 27 Feb 2018 16:47:15 +0800 Message-ID: <1519721235-28552-7-git-send-email-Monk.Liu@amd.com> References: <1519721235-28552-1-git-send-email-Monk.Liu@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1519721235-28552-1-git-send-email-Monk.Liu-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: Monk Liu c2hvdWxkIHVzZSBib19jcmVhdGVfa2VybmVsIGluc3RlYWQgb2Ygc3BsaXQgdG8gdHdvCmZ1bmN0 aW9uIHRoYXQgY3JlYXRlIGFuZCBwaW4gdGhlIFNBIGJvCgppc3N1ZToKYmVmb3JlIHRoaXMgcGF0 Y2gsIHRoZXJlIGFyZSBETUFSIHJlYWQgZXJyb3IgaW4gaG9zdApzaWRlIHdoZW4gcnVubmluZyBT UklPViB0ZXN0LCB0aGUgRE1BUiBhZGRyZXNzIGRyb3BwZWQKaW4gdGhlIHJhbmdlIG9mIFNBIGJv LgoKZml4OgphZnRlciB0aGlzIGNsZWFudXBzIG9mIFNBIGluaXQgYW5kIGZpbmksIGFib3ZlIERN QVIKZXJvciBnb25lLgoKdjI6CmtlZXAgc2FfYm8ncyBmaW5pIGluc3RlYWQgb2Ygc3VzcGVuZCwg dG8ga2VlcApyZXBvcnRpbmcgZXJyb3IKCkNoYW5nZS1JZDogSTNmMjk5YTMzNDJiZDcyNjM3NzZi ZmY2OWU0YjMxYjBkMzgxNjc0OWEKU2lnbmVkLW9mZi1ieTogTW9uayBMaXUgPE1vbmsuTGl1QGFt ZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2liLmMgICAgIHwg IDYgLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmggfCAgMiAt CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfc2EuYyAgICAgfCA2MiArKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygr KSwgNTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2liLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfaWIuYwpp bmRleCBkNjYxNzFmLi41YTFjNjc4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfaWIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf aWIuYwpAQCAtMjc5LDExICsyNzksNiBAQCBpbnQgYW1kZ3B1X2liX3Bvb2xfaW5pdChzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldikKIAkJcmV0dXJuIHI7CiAJfQogCi0JciA9IGFtZGdwdV9zYV9i b19tYW5hZ2VyX3N0YXJ0KGFkZXYsICZhZGV2LT5yaW5nX3RtcF9ibyk7Ci0JaWYgKHIpIHsKLQkJ cmV0dXJuIHI7Ci0JfQotCiAJYWRldi0+aWJfcG9vbF9yZWFkeSA9IHRydWU7CiAJaWYgKGFtZGdw dV9kZWJ1Z2ZzX3NhX2luaXQoYWRldikpIHsKIAkJZGV2X2VycihhZGV2LT5kZXYsICJmYWlsZWQg dG8gcmVnaXN0ZXIgZGVidWdmcyBmaWxlIGZvciBTQVxuIik7CkBAIC0zMDIsNyArMjk3LDYgQEAg aW50IGFtZGdwdV9pYl9wb29sX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB2b2lk IGFtZGdwdV9pYl9wb29sX2Zpbmkoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJaWYg KGFkZXYtPmliX3Bvb2xfcmVhZHkpIHsKLQkJYW1kZ3B1X3NhX2JvX21hbmFnZXJfc3VzcGVuZChh ZGV2LCAmYWRldi0+cmluZ190bXBfYm8pOwogCQlhbWRncHVfc2FfYm9fbWFuYWdlcl9maW5pKGFk ZXYsICZhZGV2LT5yaW5nX3RtcF9ibyk7CiAJCWFkZXYtPmliX3Bvb2xfcmVhZHkgPSBmYWxzZTsK IAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0 LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmgKaW5kZXggYzJi MDJmNS4uMWNlZjk0NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X29iamVjdC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmpl Y3QuaApAQCAtMjgxLDggKzI4MSw2IEBAIHZvaWQgYW1kZ3B1X3NhX2JvX21hbmFnZXJfZmluaShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJCQkgICAgICBzdHJ1Y3QgYW1kZ3B1X3NhX21h bmFnZXIgKnNhX21hbmFnZXIpOwogaW50IGFtZGdwdV9zYV9ib19tYW5hZ2VyX3N0YXJ0KHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCSAgICAgIHN0cnVjdCBhbWRncHVfc2FfbWFuYWdl ciAqc2FfbWFuYWdlcik7Ci1pbnQgYW1kZ3B1X3NhX2JvX21hbmFnZXJfc3VzcGVuZChzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwKLQkJCQkJc3RydWN0IGFtZGdwdV9zYV9tYW5hZ2VyICpzYV9t YW5hZ2VyKTsKIGludCBhbWRncHVfc2FfYm9fbmV3KHN0cnVjdCBhbWRncHVfc2FfbWFuYWdlciAq c2FfbWFuYWdlciwKIAkJICAgICBzdHJ1Y3QgYW1kZ3B1X3NhX2JvICoqc2FfYm8sCiAJCSAgICAg dW5zaWduZWQgc2l6ZSwgdW5zaWduZWQgYWxpZ24pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3NhLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfc2EuYwppbmRleCA1Y2E3NWE0Li5mYjE2NjdiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfc2EuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfc2EuYwpAQCAtNjMsMjEgKzYzLDI3IEBAIGludCBhbWRncHVfc2FfYm9fbWFu YWdlcl9pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCWZvciAoaSA9IDA7IGkgPCBB TURHUFVfU0FfTlVNX0ZFTkNFX0xJU1RTOyArK2kpCiAJCUlOSVRfTElTVF9IRUFEKCZzYV9tYW5h Z2VyLT5mbGlzdFtpXSk7CiAKLQlyID0gYW1kZ3B1X2JvX2NyZWF0ZShhZGV2LCBzaXplLCBhbGln biwgdHJ1ZSwgZG9tYWluLAotCQkJICAgICAwLCBOVUxMLCBOVUxMLCAmc2FfbWFuYWdlci0+Ym8p OworCXIgPSBhbWRncHVfYm9fY3JlYXRlX2tlcm5lbChhZGV2LCBzaXplLCBhbGlnbiwgZG9tYWlu LCAmc2FfbWFuYWdlci0+Ym8sCisJCQkJJnNhX21hbmFnZXItPmdwdV9hZGRyLCAmc2FfbWFuYWdl ci0+Y3B1X3B0cik7CiAJaWYgKHIpIHsKIAkJZGV2X2VycihhZGV2LT5kZXYsICIoJWQpIGZhaWxl ZCB0byBhbGxvY2F0ZSBibyBmb3IgbWFuYWdlclxuIiwgcik7CiAJCXJldHVybiByOwogCX0KIAor CW1lbXNldChzYV9tYW5hZ2VyLT5jcHVfcHRyLCAwLCBzYV9tYW5hZ2VyLT5zaXplKTsKIAlyZXR1 cm4gcjsKIH0KIAogdm9pZCBhbWRncHVfc2FfYm9fbWFuYWdlcl9maW5pKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LAotCQkJICAgICAgIHN0cnVjdCBhbWRncHVfc2FfbWFuYWdlciAqc2FfbWFu YWdlcikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBhbWRncHVfc2FfbWFu YWdlciAqc2FfbWFuYWdlcikKIHsKIAlzdHJ1Y3QgYW1kZ3B1X3NhX2JvICpzYV9ibywgKnRtcDsK IAorCWlmIChzYV9tYW5hZ2VyLT5ibyA9PSBOVUxMKSB7CisJCWRldl9lcnIoYWRldi0+ZGV2LCAi bm8gYm8gZm9yIHNhIG1hbmFnZXJcbiIpOworCQlyZXR1cm47CisJfQorCiAJaWYgKCFsaXN0X2Vt cHR5KCZzYV9tYW5hZ2VyLT5vbGlzdCkpIHsKIAkJc2FfbWFuYWdlci0+aG9sZSA9ICZzYV9tYW5h Z2VyLT5vbGlzdCwKIAkJYW1kZ3B1X3NhX2JvX3RyeV9mcmVlKHNhX21hbmFnZXIpOwpAQCAtODgs NTUgKzk0LDkgQEAgdm9pZCBhbWRncHVfc2FfYm9fbWFuYWdlcl9maW5pKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LAogCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShzYV9ibywgdG1wLCAmc2Ff bWFuYWdlci0+b2xpc3QsIG9saXN0KSB7CiAJCWFtZGdwdV9zYV9ib19yZW1vdmVfbG9ja2VkKHNh X2JvKTsKIAl9Ci0JYW1kZ3B1X2JvX3VucmVmKCZzYV9tYW5hZ2VyLT5ibyk7Ci0Jc2FfbWFuYWdl ci0+c2l6ZSA9IDA7Ci19Ci0KLWludCBhbWRncHVfc2FfYm9fbWFuYWdlcl9zdGFydChzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwKLQkJCSAgICAgICBzdHJ1Y3QgYW1kZ3B1X3NhX21hbmFnZXIg KnNhX21hbmFnZXIpCi17Ci0JaW50IHI7Ci0KLQlpZiAoc2FfbWFuYWdlci0+Ym8gPT0gTlVMTCkg ewotCQlkZXZfZXJyKGFkZXYtPmRldiwgIm5vIGJvIGZvciBzYSBtYW5hZ2VyXG4iKTsKLQkJcmV0 dXJuIC1FSU5WQUw7Ci0JfQogCi0JLyogbWFwIHRoZSBidWZmZXIgKi8KLQlyID0gYW1kZ3B1X2Jv X3Jlc2VydmUoc2FfbWFuYWdlci0+Ym8sIGZhbHNlKTsKLQlpZiAocikgewotCQlkZXZfZXJyKGFk ZXYtPmRldiwgIiglZCkgZmFpbGVkIHRvIHJlc2VydmUgbWFuYWdlciBib1xuIiwgcik7Ci0JCXJl dHVybiByOwotCX0KLQlyID0gYW1kZ3B1X2JvX3BpbihzYV9tYW5hZ2VyLT5ibywgc2FfbWFuYWdl ci0+ZG9tYWluLCAmc2FfbWFuYWdlci0+Z3B1X2FkZHIpOwotCWlmIChyKSB7Ci0JCWFtZGdwdV9i b191bnJlc2VydmUoc2FfbWFuYWdlci0+Ym8pOwotCQlkZXZfZXJyKGFkZXYtPmRldiwgIiglZCkg ZmFpbGVkIHRvIHBpbiBtYW5hZ2VyIGJvXG4iLCByKTsKLQkJcmV0dXJuIHI7Ci0JfQotCXIgPSBh bWRncHVfYm9fa21hcChzYV9tYW5hZ2VyLT5ibywgJnNhX21hbmFnZXItPmNwdV9wdHIpOwotCW1l bXNldChzYV9tYW5hZ2VyLT5jcHVfcHRyLCAwLCBzYV9tYW5hZ2VyLT5zaXplKTsKLQlhbWRncHVf Ym9fdW5yZXNlcnZlKHNhX21hbmFnZXItPmJvKTsKLQlyZXR1cm4gcjsKLX0KLQotaW50IGFtZGdw dV9zYV9ib19tYW5hZ2VyX3N1c3BlbmQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCi0JCQkJ IHN0cnVjdCBhbWRncHVfc2FfbWFuYWdlciAqc2FfbWFuYWdlcikKLXsKLQlpbnQgcjsKLQotCWlm IChzYV9tYW5hZ2VyLT5ibyA9PSBOVUxMKSB7Ci0JCWRldl9lcnIoYWRldi0+ZGV2LCAibm8gYm8g Zm9yIHNhIG1hbmFnZXJcbiIpOwotCQlyZXR1cm4gLUVJTlZBTDsKLQl9Ci0KLQlyID0gYW1kZ3B1 X2JvX3Jlc2VydmUoc2FfbWFuYWdlci0+Ym8sIHRydWUpOwotCWlmICghcikgewotCQlhbWRncHVf Ym9fa3VubWFwKHNhX21hbmFnZXItPmJvKTsKLQkJYW1kZ3B1X2JvX3VucGluKHNhX21hbmFnZXIt PmJvKTsKLQkJYW1kZ3B1X2JvX3VucmVzZXJ2ZShzYV9tYW5hZ2VyLT5ibyk7Ci0JfQotCXJldHVy biByOworCWFtZGdwdV9ib19mcmVlX2tlcm5lbCgmc2FfbWFuYWdlci0+Ym8sICZzYV9tYW5hZ2Vy LT5ncHVfYWRkciwgJnNhX21hbmFnZXItPmNwdV9wdHIpOworCXNhX21hbmFnZXItPnNpemUgPSAw OwogfQogCiBzdGF0aWMgdm9pZCBhbWRncHVfc2FfYm9fcmVtb3ZlX2xvY2tlZChzdHJ1Y3QgYW1k Z3B1X3NhX2JvICpzYV9ibykKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZngK