From: Trigger Huang Subject: [PATCH V3] drm/amdgpu: Destroy psp ring in hw_fini Date: Thu, 20 Apr 2017 00:15:52 -0400 Message-ID: <1492661752-6854-1-git-send-email-trigger.huang@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: ray.huang-5C7GfCeVMHo@public.gmane.org, Xiangliang.Yu-5C7GfCeVMHo@public.gmane.org, Monk.Liu-5C7GfCeVMHo@public.gmane.org, Trigger Huang Rml4IGlzc3VlIHRoYXQgUFNQIGluaXRpYWxpemF0aW9uIHdpbGwgZmFpbCBpZiByZWxvYWQgYW1k Z3B1IG1vZHVsZS4KVGhhdCdzIGJlY2F1c2UgdGhlIFBTUCByaW5nIG11c3QgYmUgZGVzdHJveWVk IHRvIGJlIHJlYWR5IGZvciB0aGUKbmV4dCB0aW1lIFBTUCBpbml0aWFsaXphdGlvbi4KCkNoYW5n ZXMgaW4gdjI6CgktIE1vdmUgcHNwX3JpbmdfZGVzdHJveSBiZWZvcmUgYWxsIEJPcyBmcmVlIChz dWdnZXN0ZWQgYnkKCSAgUmF5IEh1YW5nKS4KQ2hhbmdlcyBpbiB2MzoKCS0gQ2hlY2sgZmlybXdh cmUgbG9hZCB0eXBlLCBpZiBpdCBpcyBub3QgUFNQLCB3ZSBzaG91bGQgZG8KCSAgbm90aGluZyBp biBmd19maW5pKCksIGFuZCBvZiBjb3Vyc2Ugd2lsbCBub3QgZGVzdHJveQoJICBQU1AgcmluZyB0 b28gKHN1Z2dlc3RlZCBieSBSYXkgSHVhbmcpLgoKU2lnbmVkLW9mZi1ieTogVHJpZ2dlciBIdWFu ZyA8dHJpZ2dlci5odWFuZ0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9wc3AuYyB8ICA5ICsrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X3BzcC5oIHwgIDMgKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9wc3BfdjNf MS5jICAgfCAyNyArKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L3BzcF92M18xLmggICB8ICAyICsrCiA0IGZpbGVzIGNoYW5nZWQsIDM5IGluc2Vy dGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X3BzcC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3BzcC5jCmluZGV4IDE5MTgwYWEuLjFlMzgwZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfcHNwLmMKQEAgLTU2LDYgKzU2LDcgQEAgc3RhdGljIGludCBwc3Bfc3dfaW5pdCh2 b2lkICpoYW5kbGUpCiAJCXBzcC0+cHJlcF9jbWRfYnVmID0gcHNwX3YzXzFfcHJlcF9jbWRfYnVm OwogCQlwc3AtPnJpbmdfaW5pdCA9IHBzcF92M18xX3JpbmdfaW5pdDsKIAkJcHNwLT5yaW5nX2Ny ZWF0ZSA9IHBzcF92M18xX3JpbmdfY3JlYXRlOworCQlwc3AtPnJpbmdfZGVzdHJveSA9IHBzcF92 M18xX3JpbmdfZGVzdHJveTsKIAkJcHNwLT5jbWRfc3VibWl0ID0gcHNwX3YzXzFfY21kX3N1Ym1p dDsKIAkJcHNwLT5jb21wYXJlX3NyYW1fZGF0YSA9IHBzcF92M18xX2NvbXBhcmVfc3JhbV9kYXRh OwogCQlwc3AtPnNtdV9yZWxvYWRfcXVpcmsgPSBwc3BfdjNfMV9zbXVfcmVsb2FkX3F1aXJrOwpA QCAtNDExLDggKzQxMiwxMiBAQCBzdGF0aWMgaW50IHBzcF9od19maW5pKHZvaWQgKmhhbmRsZSkK IAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhh bmRsZTsKIAlzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCA9ICZhZGV2LT5wc3A7CiAKLQlpZiAoYWRl di0+ZmlybXdhcmUubG9hZF90eXBlID09IEFNREdQVV9GV19MT0FEX1BTUCkKLQkJYW1kZ3B1X3Vj b2RlX2ZpbmlfYm8oYWRldik7CisJaWYgKGFkZXYtPmZpcm13YXJlLmxvYWRfdHlwZSAhPSBBTURH UFVfRldfTE9BRF9QU1ApCisJCXJldHVybiAwOworCisJYW1kZ3B1X3Vjb2RlX2ZpbmlfYm8oYWRl dik7CisKKwlwc3BfcmluZ19kZXN0cm95KHBzcCwgUFNQX1JJTkdfVFlQRV9fS00pOwogCiAJaWYg KHBzcC0+dG1yX2J1ZikKIAkJYW1kZ3B1X2JvX2ZyZWVfa2VybmVsKCZwc3AtPnRtcl9ibywgJnBz cC0+dG1yX21jX2FkZHIsICZwc3AtPnRtcl9idWYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3BzcC5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X3BzcC5oCmluZGV4IDI4ZmFiYTUuLjAzMDFlNGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wc3AuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfcHNwLmgKQEAgLTY2LDYgKzY2LDggQEAgc3RydWN0IHBzcF9jb250ZXh0 CiAJCQkgICAgc3RydWN0IHBzcF9nZnhfY21kX3Jlc3AgKmNtZCk7CiAJaW50ICgqcmluZ19pbml0 KShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwgZW51bSBwc3BfcmluZ190eXBlIHJpbmdfdHlwZSk7 CiAJaW50ICgqcmluZ19jcmVhdGUpKHN0cnVjdCBwc3BfY29udGV4dCAqcHNwLCBlbnVtIHBzcF9y aW5nX3R5cGUgcmluZ190eXBlKTsKKwlpbnQgKCpyaW5nX2Rlc3Ryb3kpKHN0cnVjdCBwc3BfY29u dGV4dCAqcHNwLAorCQkJICAgIGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpOwogCWludCAo KmNtZF9zdWJtaXQpKHN0cnVjdCBwc3BfY29udGV4dCAqcHNwLCBzdHJ1Y3QgYW1kZ3B1X2Zpcm13 YXJlX2luZm8gKnVjb2RlLAogCQkJICB1aW50NjRfdCBjbWRfYnVmX21jX2FkZHIsIHVpbnQ2NF90 IGZlbmNlX21jX2FkZHIsIGludCBpbmRleCk7CiAJYm9vbCAoKmNvbXBhcmVfc3JhbV9kYXRhKShz dHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKQEAgLTExNiw2ICsxMTgsNyBAQCBzdHJ1Y3QgYW1kZ3B1 X3BzcF9mdW5jcyB7CiAjZGVmaW5lIHBzcF9wcmVwX2NtZF9idWYodWNvZGUsIHR5cGUpIChwc3Ap LT5wcmVwX2NtZF9idWYoKHVjb2RlKSwgKHR5cGUpKQogI2RlZmluZSBwc3BfcmluZ19pbml0KHBz cCwgdHlwZSkgKHBzcCktPnJpbmdfaW5pdCgocHNwKSwgKHR5cGUpKQogI2RlZmluZSBwc3Bfcmlu Z19jcmVhdGUocHNwLCB0eXBlKSAocHNwKS0+cmluZ19jcmVhdGUoKHBzcCksICh0eXBlKSkKKyNk ZWZpbmUgcHNwX3JpbmdfZGVzdHJveShwc3AsIHR5cGUpICgocHNwKS0+cmluZ19kZXN0cm95KChw c3ApLCAodHlwZSkpKQogI2RlZmluZSBwc3BfY21kX3N1Ym1pdChwc3AsIHVjb2RlLCBjbWRfbWMs IGZlbmNlX21jLCBpbmRleCkgXAogCQkocHNwKS0+Y21kX3N1Ym1pdCgocHNwKSwgKHVjb2RlKSwg KGNtZF9tYyksIChmZW5jZV9tYyksIChpbmRleCkpCiAjZGVmaW5lIHBzcF9jb21wYXJlX3NyYW1f ZGF0YShwc3AsIHVjb2RlLCB0eXBlKSBcCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9wc3BfdjNfMS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YzXzEu YwppbmRleCBkMzUxNTgzLi5lODM0YjU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9wc3BfdjNfMS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92 M18xLmMKQEAgLTMyMSw2ICszMjEsMzMgQEAgaW50IHBzcF92M18xX3JpbmdfY3JlYXRlKHN0cnVj dCBwc3BfY29udGV4dCAqcHNwLCBlbnVtIHBzcF9yaW5nX3R5cGUgcmluZ190eXBlKQogCXJldHVy biByZXQ7CiB9CiAKK2ludCBwc3BfdjNfMV9yaW5nX2Rlc3Ryb3koc3RydWN0IHBzcF9jb250ZXh0 ICpwc3AsIGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpCit7CisJaW50IHJldCA9IDA7CisJ c3RydWN0IHBzcF9yaW5nICpyaW5nOworCXVuc2lnbmVkIGludCBwc3BfcmluZ19yZWcgPSAwOwor CXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcHNwLT5hZGV2OworCisJcmluZyA9ICZwc3At PmttX3Jpbmc7CisKKwkvKiBXcml0ZSB0aGUgcmluZyBkZXN0cm95IGNvbW1hbmQgdG8gQzJQTVNH XzY0ICovCisJcHNwX3JpbmdfcmVnID0gMyA8PCAxNjsKKwlXUkVHMzIoU09DMTVfUkVHX09GRlNF VChNUDAsIDAsIG1tTVAwX1NNTl9DMlBNU0dfNjQpLCBwc3BfcmluZ19yZWcpOworCisJLyogdGhl cmUgbWlnaHQgYmUgaGFuZHNoYWtlIGlzc3VlIHdpdGggaGFyZHdhcmUgd2hpY2ggbmVlZHMgZGVs YXkgKi8KKwltZGVsYXkoMjApOworCisJLyogV2FpdCBmb3IgcmVzcG9uc2UgZmxhZyAoYml0IDMx KSBpbiBDMlBNU0dfNjQgKi8KKwlyZXQgPSBwc3Bfd2FpdF9mb3IocHNwLCBTT0MxNV9SRUdfT0ZG U0VUKE1QMCwgMCwgbW1NUDBfU01OX0MyUE1TR182NCksCisJCQkgICAweDgwMDAwMDAwLCAweDgw MDBGRkZGLCBmYWxzZSk7CisKKwlpZiAocmluZy0+cmluZ19tZW0pCisJCWFtZGdwdV9ib19mcmVl X2tlcm5lbCgmYWRldi0+ZmlybXdhcmUucmJ1ZiwKKwkJCQkgICAgICAmcmluZy0+cmluZ19tZW1f bWNfYWRkciwKKwkJCQkgICAgICAodm9pZCAqKikmcmluZy0+cmluZ19tZW0pOworCXJldHVybiBy ZXQ7Cit9CisKIGludCBwc3BfdjNfMV9jbWRfc3VibWl0KHN0cnVjdCBwc3BfY29udGV4dCAqcHNw LAogCQkgICAgICAgIHN0cnVjdCBhbWRncHVfZmlybXdhcmVfaW5mbyAqdWNvZGUsCiAJCSAgICAg ICAgdWludDY0X3QgY21kX2J1Zl9tY19hZGRyLCB1aW50NjRfdCBmZW5jZV9tY19hZGRyLApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YzXzEuaCBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18xLmgKaW5kZXggNTIzMGQyNzguLjlkY2QwYjIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3BzcF92M18xLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvcHNwX3YzXzEuaApAQCAtNDEsNiArNDEsOCBAQCBleHRl cm4gaW50IHBzcF92M18xX3JpbmdfaW5pdChzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKIAkJCSAg ICAgIGVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpOwogZXh0ZXJuIGludCBwc3BfdjNfMV9y aW5nX2NyZWF0ZShzdHJ1Y3QgcHNwX2NvbnRleHQgKnBzcCwKIAkJCQllbnVtIHBzcF9yaW5nX3R5 cGUgcmluZ190eXBlKTsKK2V4dGVybiBpbnQgcHNwX3YzXzFfcmluZ19kZXN0cm95KHN0cnVjdCBw c3BfY29udGV4dCAqcHNwLAorCQkJCWVudW0gcHNwX3JpbmdfdHlwZSByaW5nX3R5cGUpOwogZXh0 ZXJuIGludCBwc3BfdjNfMV9jbWRfc3VibWl0KHN0cnVjdCBwc3BfY29udGV4dCAqcHNwLAogCQkJ ICAgICAgIHN0cnVjdCBhbWRncHVfZmlybXdhcmVfaW5mbyAqdWNvZGUsCiAJCQkgICAgICAgdWlu dDY0X3QgY21kX2J1Zl9tY19hZGRyLCB1aW50NjRfdCBmZW5jZV9tY19hZGRyLAotLSAKMi43LjQK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZngg bWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=