From: "Changfeng.Zhu" Subject: [PATCH 2/2] drm/amdgpu: invalidate mmhub semphore workaround in gmc9/gmc10 Date: Wed, 20 Nov 2019 18:22:05 +0800 Message-ID: <20191120102205.31336-1-changfeng.zhu@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: Christian.Koenig-5C7GfCeVMHo@public.gmane.org, Jack.Xiao-5C7GfCeVMHo@public.gmane.org, Tao.Zhou1-5C7GfCeVMHo@public.gmane.org, Ray.Huang-5C7GfCeVMHo@public.gmane.org, Xinmei.Huang-5C7GfCeVMHo@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: changzhu RnJvbTogY2hhbmd6aHUgPENoYW5nZmVuZy5aaHVAYW1kLmNvbT4KCkl0IG1heSBsb3NlIGdwdXZt IGludmFsaWRhdGUgYWNrbm93bGRlZ2Ugc3RhdGUgYWNyb3NzIHBvd2VyLWdhdGluZyBvZmYKY3lj bGUuIFRvIGF2b2lkIHRoaXMgaXNzdWUgaW4gZ21jOS9nbWMxMCBpbnZhbGlkYXRpb24sIGFkZCBz ZW1hcGhvcmUgYWNxdWlyZQpiZWZvcmUgaW52YWxpZGF0aW9uIGFuZCBzZW1hcGhvcmUgcmVsZWFz ZSBhZnRlciBpbnZhbGlkYXRpb24uCgpBZnRlciBhZGRpbmcgc2VtYXBob3JlIGFjcXVpcmUgYmVm b3JlIGludmFsaWRhdGlvbiwgdGhlIHNlbWFwaG9yZQpyZWdpc3RlciBiZWNvbWUgcmVhZC1vbmx5 IGlmIGFub3RoZXIgcHJvY2VzcyB0cnkgdG8gYWNxdWlyZSBzZW1hcGhvcmUuClRoZW4gaXQgd2ls bCBub3QgYmUgYWJsZSB0byByZWxlYXNlIHRoaXMgc2VtYXBob3JlLiBUaGVuIGl0IG1heSBjYXVz ZQpkZWFkbG9jayBwcm9ibGVtLiBJZiB0aGlzIGRlYWRsb2NrIHByb2JsZW0gaGFwcGVucywgaXQg bmVlZHMgYSBzZW1hcGhvcmUKZmlybXdhcmUgZml4LgoKQ2hhbmdlLUlkOiBJOTk0MmEyZjQ1MTI2 NWMxZjEwMzhjY2ZlMmY3MDA0MmM3YzgxMThhZgpTaWduZWQtb2ZmLWJ5OiBjaGFuZ3podSA8Q2hh bmdmZW5nLlpodUBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192 MTBfMC5jIHwgNTQgKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dtY192OV8wLmMgIHwgNTQgKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NvYzE1LmggICAgIHwgIDQgKy0KIDMgZmlsZXMgY2hh bmdlZCwgMTEwIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3YxMF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9nbWNfdjEwXzAuYwppbmRleCBhZjI2MTViYTUyYWEuLmZmODBhNjJjYTUxNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3YxMF8wLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3YxMF8wLmMKQEAgLTIzNCw2ICsyMzQsMjcgQEAg c3RhdGljIHZvaWQgZ21jX3YxMF8wX2ZsdXNoX3ZtX2h1YihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwgdWludDMyX3Qgdm1pZCwKIAljb25zdCB1bnNpZ25lZCBlbmcgPSAxNzsKIAl1bnNpZ25l ZCBpbnQgaTsKIAorCXNwaW5fbG9jaygmYWRldi0+Z21jLmludmFsaWRhdGVfbG9jayk7CisJLyoK KwkgKiBJdCBtYXkgbG9zZSBncHV2bSBpbnZhbGlkYXRlIGFja25vd2xkZWdlIHN0YXRlIGFjcm9z cyBwb3dlci1nYXRpbmcKKwkgKiBvZmYgY3ljbGUsIGFkZCBzZW1hcGhvcmUgYWNxdWlyZSBiZWZv cmUgaW52YWxpZGF0aW9uIGFuZCBzZW1hcGhvcmUKKwkgKiByZWxlYXNlIGFmdGVyIGludmFsaWRh dGlvbiB0byBhdm9pZCBlbnRlcmluZyBwb3dlciBnYXRlZCBzdGF0ZQorCSAqIHRvIFdBIHRoZSBJ c3N1ZQorCSAqLworCWlmICh2bWh1YiA9PSBBTURHUFVfTU1IVUJfMCB8fAorCSAgICB2bWh1YiA9 PSBBTURHUFVfTU1IVUJfMSkgeworCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXNlY190aW1lb3V0 OyBpKyspIHsKKwkJCS8qIGEgcmVhZCByZXR1cm4gdmFsdWUgb2YgMSBtZWFucyBzZW1hcGhvcmUg YWN1cWlyZSAqLworCQkJdG1wID0gUlJFRzMyX05PX0tJUShodWItPnZtX2ludl9lbmcwX3NlbSAr IGVuZyk7CisJCQlpZiAodG1wICYgMHgxKQorCQkJCWJyZWFrOworCQkJdWRlbGF5KDEpOworCQl9 CisKKwkJaWYgKGkgPj0gYWRldi0+dXNlY190aW1lb3V0KQorCQkJRFJNX0VSUk9SKCJUaW1lb3V0 IHdhaXRpbmcgZm9yIHNlbSBhY3F1aXJlIGluIFZNIGZsdXNoIVxuIik7CisJfQorCiAJV1JFRzMy X05PX0tJUShodWItPnZtX2ludl9lbmcwX3JlcSArIGVuZywgdG1wKTsKIAogCS8qCkBAIC0yNTMs NiArMjc0LDE2IEBAIHN0YXRpYyB2b2lkIGdtY192MTBfMF9mbHVzaF92bV9odWIoc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYsIHVpbnQzMl90IHZtaWQsCiAJCXVkZWxheSgxKTsKIAl9CiAKKwkv KgorCSAqIGFkZCBzZW1hcGhvcmUgcmVsZWFzZSBhZnRlciBpbnZhbGlkYXRpb24sCisJICogd3Jp dGUgd2l0aCAwIG1lYW5zIHNlbWFwaG9yZSByZWxlYXNlCisJICovCisJaWYgKHZtaHViID09IEFN REdQVV9NTUhVQl8wIHx8CisJICAgIHZtaHViID09IEFNREdQVV9NTUhVQl8xKQorCQlXUkVHMzJf Tk9fS0lRKGh1Yi0+dm1faW52X2VuZzBfc2VtICsgZW5nLCAwKTsKKworCXNwaW5fdW5sb2NrKCZh ZGV2LT5nbWMuaW52YWxpZGF0ZV9sb2NrKTsKKwogCWlmIChpIDwgYWRldi0+dXNlY190aW1lb3V0 KQogCQlyZXR1cm47CiAKQEAgLTMzOCw2ICszNjksMjEgQEAgc3RhdGljIHVpbnQ2NF90IGdtY192 MTBfMF9lbWl0X2ZsdXNoX2dwdV90bGIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCXVpbnQz Ml90IHJlcSA9IGdtY192MTBfMF9nZXRfaW52YWxpZGF0ZV9yZXEodm1pZCwgMCk7CiAJdW5zaWdu ZWQgZW5nID0gcmluZy0+dm1faW52X2VuZzsKIAorCS8qCisJICogSXQgbWF5IGxvc2UgZ3B1dm0g aW52YWxpZGF0ZSBhY2tub3dsZGVnZSBzdGF0ZSBhY3Jvc3MgcG93ZXItZ2F0aW5nCisJICogb2Zm IGN5Y2xlLCBhZGQgc2VtYXBob3JlIGFjcXVpcmUgYmVmb3JlIGludmFsaWRhdGlvbiBhbmQgc2Vt YXBob3JlCisJICogcmVsZWFzZSBhZnRlciBpbnZhbGlkYXRpb24gdG8gYXZvaWQgZW50ZXJpbmcg cG93ZXIgZ2F0ZWQgc3RhdGUKKwkgKiB0byBXQSB0aGUgSXNzdWUKKwkgKi8KKworCS8qIGEgcmVh ZCByZXR1cm4gdmFsdWUgb2YgMSBtZWFucyBzZW1hcGhvcmUgYWN1cWlyZSAqLworCWlmIChyaW5n LT5mdW5jcy0+dm1odWIgPT0gQU1ER1BVX01NSFVCXzAgfHwKKwkgICAgcmluZy0+ZnVuY3MtPnZt aHViID09IEFNREdQVV9NTUhVQl8xKSB7CisJCWFtZGdwdV9yaW5nX2VtaXRfcmVnX3dhaXQocmlu ZywKKwkJCQkJICBodWItPnZtX2ludl9lbmcwX3NlbSArIGVuZywgMHgxLCAweDEpOworCQlEUk1f V0FSTl9PTkNFKCJBZGRpbmcgc2VtYXBob3JlIG1heSBjYXVzZSBkZWFkbG9jayBhbmQgaXQgbmVl ZHMgZmlybXdhcmUgZml4XG4iKTsKKwl9CisKIAlhbWRncHVfcmluZ19lbWl0X3dyZWcocmluZywg aHViLT5jdHgwX3B0Yl9hZGRyX2xvMzIgKyAoMiAqIHZtaWQpLAogCQkJICAgICAgbG93ZXJfMzJf Yml0cyhwZF9hZGRyKSk7CiAKQEAgLTM0OCw2ICszOTQsMTQgQEAgc3RhdGljIHVpbnQ2NF90IGdt Y192MTBfMF9lbWl0X2ZsdXNoX2dwdV90bGIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQkJ CQkgICAgaHViLT52bV9pbnZfZW5nMF9hY2sgKyBlbmcsCiAJCQkJCSAgICByZXEsIDEgPDwgdm1p ZCk7CiAKKwkvKgorCSAqIGFkZCBzZW1hcGhvcmUgcmVsZWFzZSBhZnRlciBpbnZhbGlkYXRpb24s CisJICogd3JpdGUgd2l0aCAwIG1lYW5zIHNlbWFwaG9yZSByZWxlYXNlCisJICovCisJaWYgKHJp bmctPmZ1bmNzLT52bWh1YiA9PSBBTURHUFVfTU1IVUJfMCB8fAorCSAgICByaW5nLT5mdW5jcy0+ dm1odWIgPT0gQU1ER1BVX01NSFVCXzEpCisJCWFtZGdwdV9yaW5nX2VtaXRfd3JlZyhyaW5nLCBo dWItPnZtX2ludl9lbmcwX3NlbSArIGVuZywgMCk7CisKIAlyZXR1cm4gcGRfYWRkcjsKIH0KIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKaW5kZXggMWFlNTlhZjc4MzZhLi45MmI4 ZTIzNGE1ODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8w LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYwpAQCAtNDU2LDYg KzQ1NiwyNyBAQCBzdGF0aWMgdm9pZCBnbWNfdjlfMF9mbHVzaF9ncHVfdGxiKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2LCB1aW50MzJfdCB2bWlkLAogCX0KIAogCXNwaW5fbG9jaygmYWRldi0+ Z21jLmludmFsaWRhdGVfbG9jayk7CisKKwkvKgorCSAqIEl0IG1heSBsb3NlIGdwdXZtIGludmFs aWRhdGUgYWNrbm93bGRlZ2Ugc3RhdGUgYWNyb3NzIHBvd2VyLWdhdGluZworCSAqIG9mZiBjeWNs ZSwgYWRkIHNlbWFwaG9yZSBhY3F1aXJlIGJlZm9yZSBpbnZhbGlkYXRpb24gYW5kIHNlbWFwaG9y ZQorCSAqIHJlbGVhc2UgYWZ0ZXIgaW52YWxpZGF0aW9uIHRvIGF2b2lkIGVudGVyaW5nIHBvd2Vy IGdhdGVkIHN0YXRlCisJICogdG8gV0EgdGhlIElzc3VlCisJICovCisJaWYgKHZtaHViID09IEFN REdQVV9NTUhVQl8wIHx8CisJICAgIHZtaHViID09IEFNREdQVV9NTUhVQl8xKSB7CisJCWZvciAo aiA9IDA7IGogPCBhZGV2LT51c2VjX3RpbWVvdXQ7IGorKykgeworCQkJLyogYSByZWFkIHJldHVy biB2YWx1ZSBvZiAxIG1lYW5zIHNlbWFwaG9yZSBhY3VxaXJlICovCisJCQl0bXAgPSBSUkVHMzJf Tk9fS0lRKGh1Yi0+dm1faW52X2VuZzBfc2VtICsgZW5nKTsKKwkJCWlmICh0bXAgJiAweDEpCisJ CQkJYnJlYWs7CisJCQl1ZGVsYXkoMSk7CisJCX0KKworCQlpZiAoaiA+PSBhZGV2LT51c2VjX3Rp bWVvdXQpCisJCQlEUk1fRVJST1IoIlRpbWVvdXQgd2FpdGluZyBmb3Igc2VtIGFjcXVpcmUgaW4g Vk0gZmx1c2ghXG4iKTsKKwl9CisKIAlXUkVHMzJfTk9fS0lRKGh1Yi0+dm1faW52X2VuZzBfcmVx ICsgZW5nLCB0bXApOwogCiAJLyoKQEAgLTQ3MSw3ICs0OTIsMTcgQEAgc3RhdGljIHZvaWQgZ21j X3Y5XzBfZmx1c2hfZ3B1X3RsYihzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgdWludDMyX3Qg dm1pZCwKIAkJCWJyZWFrOwogCQl1ZGVsYXkoMSk7CiAJfQorCisJLyoKKwkgKiBhZGQgc2VtYXBo b3JlIHJlbGVhc2UgYWZ0ZXIgaW52YWxpZGF0aW9uLAorCSAqIHdyaXRlIHdpdGggMCBtZWFucyBz ZW1hcGhvcmUgcmVsZWFzZQorCSAqLworCWlmICh2bWh1YiA9PSBBTURHUFVfTU1IVUJfMCB8fAor CSAgICB2bWh1YiA9PSBBTURHUFVfTU1IVUJfMSkKKwkJV1JFRzMyX05PX0tJUShodWItPnZtX2lu dl9lbmcwX3NlbSArIGVuZywgMCk7CisKIAlzcGluX3VubG9jaygmYWRldi0+Z21jLmludmFsaWRh dGVfbG9jayk7CisKIAlpZiAoaiA8IGFkZXYtPnVzZWNfdGltZW91dCkKIAkJcmV0dXJuOwogCkBA IC00ODYsNiArNTE3LDIxIEBAIHN0YXRpYyB1aW50NjRfdCBnbWNfdjlfMF9lbWl0X2ZsdXNoX2dw dV90bGIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCXVpbnQzMl90IHJlcSA9IGdtY192OV8w X2dldF9pbnZhbGlkYXRlX3JlcSh2bWlkLCAwKTsKIAl1bnNpZ25lZCBlbmcgPSByaW5nLT52bV9p bnZfZW5nOwogCisJLyoKKwkgKiBJdCBtYXkgbG9zZSBncHV2bSBpbnZhbGlkYXRlIGFja25vd2xk ZWdlIHN0YXRlIGFjcm9zcyBwb3dlci1nYXRpbmcKKwkgKiBvZmYgY3ljbGUsIGFkZCBzZW1hcGhv cmUgYWNxdWlyZSBiZWZvcmUgaW52YWxpZGF0aW9uIGFuZCBzZW1hcGhvcmUKKwkgKiByZWxlYXNl IGFmdGVyIGludmFsaWRhdGlvbiB0byBhdm9pZCBlbnRlcmluZyBwb3dlciBnYXRlZCBzdGF0ZQor CSAqIHRvIFdBIHRoZSBJc3N1ZQorCSAqLworCisJLyogYSByZWFkIHJldHVybiB2YWx1ZSBvZiAx IG1lYW5zIHNlbWFwaG9yZSBhY3VxaXJlICovCisJaWYgKHJpbmctPmZ1bmNzLT52bWh1YiA9PSBB TURHUFVfTU1IVUJfMCB8fAorCSAgICByaW5nLT5mdW5jcy0+dm1odWIgPT0gQU1ER1BVX01NSFVC XzEpIHsKKwkJYW1kZ3B1X3JpbmdfZW1pdF9yZWdfd2FpdChyaW5nLAorCQkJCQkgIGh1Yi0+dm1f aW52X2VuZzBfc2VtICsgZW5nLCAweDEsIDB4MSk7CisJCURSTV9XQVJOX09OQ0UoIkFkZGluZyBz ZW1hcGhvcmUgbWF5IGNhdXNlIGRlYWRsb2NrIGFuZCBpdCBuZWVkcyBmaXJtd2FyZSBmaXhcbiIp OworCX0KKwogCWFtZGdwdV9yaW5nX2VtaXRfd3JlZyhyaW5nLCBodWItPmN0eDBfcHRiX2FkZHJf bG8zMiArICgyICogdm1pZCksCiAJCQkgICAgICBsb3dlcl8zMl9iaXRzKHBkX2FkZHIpKTsKIApA QCAtNDk2LDYgKzU0MiwxNCBAQCBzdGF0aWMgdWludDY0X3QgZ21jX3Y5XzBfZW1pdF9mbHVzaF9n cHVfdGxiKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZywKIAkJCQkJICAgIGh1Yi0+dm1faW52X2Vu ZzBfYWNrICsgZW5nLAogCQkJCQkgICAgcmVxLCAxIDw8IHZtaWQpOwogCisJLyoKKwkgKiBhZGQg c2VtYXBob3JlIHJlbGVhc2UgYWZ0ZXIgaW52YWxpZGF0aW9uLAorCSAqIHdyaXRlIHdpdGggMCBt ZWFucyBzZW1hcGhvcmUgcmVsZWFzZQorCSAqLworCWlmIChyaW5nLT5mdW5jcy0+dm1odWIgPT0g QU1ER1BVX01NSFVCXzAgfHwKKwkgICAgcmluZy0+ZnVuY3MtPnZtaHViID09IEFNREdQVV9NTUhV Ql8xKQorCQlhbWRncHVfcmluZ19lbWl0X3dyZWcocmluZywgaHViLT52bV9pbnZfZW5nMF9zZW0g KyBlbmcsIDApOworCiAJcmV0dXJuIHBkX2FkZHI7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L3NvYzE1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9z b2MxNS5oCmluZGV4IDlhZjZjNmZmYmZhMi4uNTdhZjQ4OWE1ZGUzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zb2MxNS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L3NvYzE1LmgKQEAgLTI4LDggKzI4LDggQEAKICNpbmNsdWRlICJuYmlvX3Y3XzAuaCIK ICNpbmNsdWRlICJuYmlvX3Y3XzQuaCIKIAotI2RlZmluZSBTT0MxNV9GTFVTSF9HUFVfVExCX05V TV9XUkVHCQk0Ci0jZGVmaW5lIFNPQzE1X0ZMVVNIX0dQVV9UTEJfTlVNX1JFR19XQUlUCTEKKyNk ZWZpbmUgU09DMTVfRkxVU0hfR1BVX1RMQl9OVU1fV1JFRwkJNgorI2RlZmluZSBTT0MxNV9GTFVT SF9HUFVfVExCX05VTV9SRUdfV0FJVAkzCiAKIGV4dGVybiBjb25zdCBzdHJ1Y3QgYW1kX2lwX2Z1 bmNzIHNvYzE1X2NvbW1vbl9pcF9mdW5jczsKIAotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2FtZC1nZng=