From: Alex Deucher Subject: [PATCH 040/102] drm/amdgpu: add paging queue support for 8 SDMA instances on Arcturus Date: Mon, 15 Jul 2019 16:23:35 -0500 Message-ID: <20190715212437.31793-38-alexander.deucher@amd.com> References: <20190715212437.31793-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190715212437.31793-1-alexander.deucher-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: Alex Deucher , Le Ma , =?UTF-8?q?Christian=20K=C3=B6nig?= RnJvbTogTGUgTWEgPGxlLm1hQGFtZC5jb20+CgpTaWduZWQtb2ZmLWJ5OiBMZSBNYSA8bGUubWFA YW1kLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlzdGlhbi5rb2VuaWdA YW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBh bWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5jIHwgNjIg KysrKysrKysrKysrKysrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1MSBpbnNlcnRpb25z KCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9zZG1hX3Y0XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5j CmluZGV4IGNmMDY0Y2FhMTYwYy4uNTk0NzUwYTlmMmZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Y0XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9zZG1hX3Y0XzAuYwpAQCAtNzMwLDE2ICs3MzAsMjAgQEAgc3RhdGljIHZvaWQgc2RtYV92 NF8wX3JsY19zdG9wKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogICovCiBzdGF0aWMgdm9p ZCBzZG1hX3Y0XzBfcGFnZV9zdG9wKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewotCXN0 cnVjdCBhbWRncHVfcmluZyAqc2RtYTAgPSAmYWRldi0+c2RtYS5pbnN0YW5jZVswXS5wYWdlOwot CXN0cnVjdCBhbWRncHVfcmluZyAqc2RtYTEgPSAmYWRldi0+c2RtYS5pbnN0YW5jZVsxXS5wYWdl OworCXN0cnVjdCBhbWRncHVfcmluZyAqc2RtYVtBTURHUFVfTUFYX1NETUFfSU5TVEFOQ0VTXTsK IAl1MzIgcmJfY250bCwgaWJfY250bDsKIAlpbnQgaTsKLQotCWlmICgoYWRldi0+bW1hbi5idWZm ZXJfZnVuY3NfcmluZyA9PSBzZG1hMCkgfHwKLQkgICAgKGFkZXYtPm1tYW4uYnVmZmVyX2Z1bmNz X3JpbmcgPT0gc2RtYTEpKQotCQlhbWRncHVfdHRtX3NldF9idWZmZXJfZnVuY3Nfc3RhdHVzKGFk ZXYsIGZhbHNlKTsKKwlib29sIHVuc2V0ID0gZmFsc2U7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRl di0+c2RtYS5udW1faW5zdGFuY2VzOyBpKyspIHsKKwkJc2RtYVtpXSA9ICZhZGV2LT5zZG1hLmlu c3RhbmNlW2ldLnBhZ2U7CisKKwkJaWYgKChhZGV2LT5tbWFuLmJ1ZmZlcl9mdW5jc19yaW5nID09 IHNkbWFbaV0pICYmCisJCQkodW5zZXQgPT0gZmFsc2UpKSB7CisJCQlhbWRncHVfdHRtX3NldF9i dWZmZXJfZnVuY3Nfc3RhdHVzKGFkZXYsIGZhbHNlKTsKKwkJCXVuc2V0ID0gdHJ1ZTsKKwkJfQor CiAJCXJiX2NudGwgPSBSUkVHMzJfU0RNQShpLCBtbVNETUEwX1BBR0VfUkJfQ05UTCk7CiAJCXJi X2NudGwgPSBSRUdfU0VUX0ZJRUxEKHJiX2NudGwsIFNETUEwX1BBR0VfUkJfQ05UTCwKIAkJCQkJ UkJfRU5BQkxFLCAwKTsKQEAgLTc0OCwxMCArNzUyLDkgQEAgc3RhdGljIHZvaWQgc2RtYV92NF8w X3BhZ2Vfc3RvcChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJaWJfY250bCA9IFJFR19T RVRfRklFTEQoaWJfY250bCwgU0RNQTBfUEFHRV9JQl9DTlRMLAogCQkJCQlJQl9FTkFCTEUsIDAp OwogCQlXUkVHMzJfU0RNQShpLCBtbVNETUEwX1BBR0VfSUJfQ05UTCwgaWJfY250bCk7Ci0JfQog Ci0Jc2RtYTAtPnNjaGVkLnJlYWR5ID0gZmFsc2U7Ci0Jc2RtYTEtPnNjaGVkLnJlYWR5ID0gZmFs c2U7CisJCXNkbWFbaV0tPnNjaGVkLnJlYWR5ID0gZmFsc2U7CisJfQogfQogCiAvKioKQEAgLTIy NTYsNyArMjI1OSwzOSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIHNk bWFfdjRfMF9wYWdlX3JpbmdfZnVuY3MgPSB7CiAJLmFsaWduX21hc2sgPSAweGYsCiAJLm5vcCA9 IFNETUFfUEtUX05PUF9IRUFERVJfT1AoU0RNQV9PUF9OT1ApLAogCS5zdXBwb3J0XzY0Yml0X3B0 cnMgPSB0cnVlLAotCS52bWh1YiA9IEFNREdQVV9NTUhVQiwKKwkudm1odWIgPSBBTURHUFVfTU1I VUJfMCwKKwkuZ2V0X3JwdHIgPSBzZG1hX3Y0XzBfcmluZ19nZXRfcnB0ciwKKwkuZ2V0X3dwdHIg PSBzZG1hX3Y0XzBfcGFnZV9yaW5nX2dldF93cHRyLAorCS5zZXRfd3B0ciA9IHNkbWFfdjRfMF9w YWdlX3Jpbmdfc2V0X3dwdHIsCisJLmVtaXRfZnJhbWVfc2l6ZSA9CisJCTYgKyAvKiBzZG1hX3Y0 XzBfcmluZ19lbWl0X2hkcF9mbHVzaCAqLworCQkzICsgLyogaGRwIGludmFsaWRhdGUgKi8KKwkJ NiArIC8qIHNkbWFfdjRfMF9yaW5nX2VtaXRfcGlwZWxpbmVfc3luYyAqLworCQkvKiBzZG1hX3Y0 XzBfcmluZ19lbWl0X3ZtX2ZsdXNoICovCisJCVNPQzE1X0ZMVVNIX0dQVV9UTEJfTlVNX1dSRUcg KiAzICsKKwkJU09DMTVfRkxVU0hfR1BVX1RMQl9OVU1fUkVHX1dBSVQgKiA2ICsKKwkJMTAgKyAx MCArIDEwLCAvKiBzZG1hX3Y0XzBfcmluZ19lbWl0X2ZlbmNlIHgzIGZvciB1c2VyIGZlbmNlLCB2 bSBmZW5jZSAqLworCS5lbWl0X2liX3NpemUgPSA3ICsgNiwgLyogc2RtYV92NF8wX3JpbmdfZW1p dF9pYiAqLworCS5lbWl0X2liID0gc2RtYV92NF8wX3JpbmdfZW1pdF9pYiwKKwkuZW1pdF9mZW5j ZSA9IHNkbWFfdjRfMF9yaW5nX2VtaXRfZmVuY2UsCisJLmVtaXRfcGlwZWxpbmVfc3luYyA9IHNk bWFfdjRfMF9yaW5nX2VtaXRfcGlwZWxpbmVfc3luYywKKwkuZW1pdF92bV9mbHVzaCA9IHNkbWFf djRfMF9yaW5nX2VtaXRfdm1fZmx1c2gsCisJLmVtaXRfaGRwX2ZsdXNoID0gc2RtYV92NF8wX3Jp bmdfZW1pdF9oZHBfZmx1c2gsCisJLnRlc3RfcmluZyA9IHNkbWFfdjRfMF9yaW5nX3Rlc3Rfcmlu ZywKKwkudGVzdF9pYiA9IHNkbWFfdjRfMF9yaW5nX3Rlc3RfaWIsCisJLmluc2VydF9ub3AgPSBz ZG1hX3Y0XzBfcmluZ19pbnNlcnRfbm9wLAorCS5wYWRfaWIgPSBzZG1hX3Y0XzBfcmluZ19wYWRf aWIsCisJLmVtaXRfd3JlZyA9IHNkbWFfdjRfMF9yaW5nX2VtaXRfd3JlZywKKwkuZW1pdF9yZWdf d2FpdCA9IHNkbWFfdjRfMF9yaW5nX2VtaXRfcmVnX3dhaXQsCisJLmVtaXRfcmVnX3dyaXRlX3Jl Z193YWl0ID0gYW1kZ3B1X3JpbmdfZW1pdF9yZWdfd3JpdGVfcmVnX3dhaXRfaGVscGVyLAorfTsK Kworc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyBzZG1hX3Y0XzBfcGFnZV9y aW5nX2Z1bmNzXzJuZF9tbWh1YiA9IHsKKwkudHlwZSA9IEFNREdQVV9SSU5HX1RZUEVfU0RNQSwK KwkuYWxpZ25fbWFzayA9IDB4ZiwKKwkubm9wID0gU0RNQV9QS1RfTk9QX0hFQURFUl9PUChTRE1B X09QX05PUCksCisJLnN1cHBvcnRfNjRiaXRfcHRycyA9IHRydWUsCisJLnZtaHViID0gQU1ER1BV X01NSFVCXzEsCiAJLmdldF9ycHRyID0gc2RtYV92NF8wX3JpbmdfZ2V0X3JwdHIsCiAJLmdldF93 cHRyID0gc2RtYV92NF8wX3BhZ2VfcmluZ19nZXRfd3B0ciwKIAkuc2V0X3dwdHIgPSBzZG1hX3Y0 XzBfcGFnZV9yaW5nX3NldF93cHRyLApAQCAtMjI5Niw3ICsyMzMxLDEyIEBAIHN0YXRpYyB2b2lk IHNkbWFfdjRfMF9zZXRfcmluZ19mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJ CQkJJnNkbWFfdjRfMF9yaW5nX2Z1bmNzOwogCQlhZGV2LT5zZG1hLmluc3RhbmNlW2ldLnJpbmcu bWUgPSBpOwogCQlpZiAoYWRldi0+c2RtYS5oYXNfcGFnZV9xdWV1ZSkgewotCQkJYWRldi0+c2Rt YS5pbnN0YW5jZVtpXS5wYWdlLmZ1bmNzID0gJnNkbWFfdjRfMF9wYWdlX3JpbmdfZnVuY3M7CisJ CQlpZiAoYWRldi0+YXNpY190eXBlID09IENISVBfQVJDVFVSVVMgJiYgaSA+PTUpCisJCQkJYWRl di0+c2RtYS5pbnN0YW5jZVtpXS5wYWdlLmZ1bmNzID0KKwkJCQkJJnNkbWFfdjRfMF9wYWdlX3Jp bmdfZnVuY3NfMm5kX21taHViOworCQkJZWxzZQorCQkJCWFkZXYtPnNkbWEuaW5zdGFuY2VbaV0u cGFnZS5mdW5jcyA9CisJCQkJCSZzZG1hX3Y0XzBfcGFnZV9yaW5nX2Z1bmNzOwogCQkJYWRldi0+ c2RtYS5pbnN0YW5jZVtpXS5wYWdlLm1lID0gaTsKIAkJfQogCX0KLS0gCjIuMjAuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5n IGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4