From: Alex Deucher Subject: [PATCH 019/102] drm/amdgpu: specify sdma instance 5~7 with second mmhub type Date: Mon, 15 Jul 2019 16:23:14 -0500 Message-ID: <20190715212437.31793-17-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: Snow Zhang , Le Ma , Alex Deucher RnJvbTogTGUgTWEgPGxlLm1hQGFtZC5jb20+CgpPbiBBcmN0dXJ1cywgc2RtYSBpbnN0YW5jZSA1 fjcgaXMgY29ubmVjdGVkIHRvIHRoZSBzZWNvbmQgbW1odWIuIFRoZSB2bWh1YiB0eXBlCmluIGFt ZGdwdV9yaW5nX2Z1bmNzIGlzIGNvbnN0YW50LCBzbyB3ZSBjcmVhdGUgYW4gaW5kaXZpZHVhbCBh bWRncHVfcmluZ19mdW5jcwp3aXRoIGRpZmZlcmVudCB2bWh1YiB0eXBlKEFNREdQVV9NTUhVQl8x KSBmb3IgdGhlc2Ugc2RtYSBpbnN0YW5jZXMuCgpTaWduZWQtb2ZmLWJ5OiBMZSBNYSA8bGUubWFA YW1kLmNvbT4KQWNrZWQtYnk6IFNub3cgWmhhbmcgPCBTbm93LlpoYW5nQGFtZC5jb20+ClNpZ25l ZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9zZG1hX3Y0XzAuYyB8IDQzICsrKysrKysrKysrKysr KysrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlv bigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92NF8wLmMKaW5kZXggYjY1MDk1MjVm NGZjLi4xZGNlOTc0ZTBjNTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3NkbWFfdjRfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5j CkBAIC0yMjEzLDYgKzIyMTMsNDIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19m dW5jcyBzZG1hX3Y0XzBfcmluZ19mdW5jcyA9IHsKIAkuZW1pdF9yZWdfd3JpdGVfcmVnX3dhaXQg PSBhbWRncHVfcmluZ19lbWl0X3JlZ193cml0ZV9yZWdfd2FpdF9oZWxwZXIsCiB9OwogCisvKgor ICogT24gQXJjdHVydXMsIFNETUEgaW5zdGFuY2UgNX43IGhhcyBhIGRpZmZlcmVudCB2bWh1YiB0 eXBlKEFNREdQVV9NTUhVQl8xKS4KKyAqIFNvIGNyZWF0ZSBhIGluZGl2aWR1YWwgY29uc3RhbnQg cmluZ19mdW5jcyBmb3IgdGhvc2UgaW5zdGFuY2VzLgorICovCitzdGF0aWMgY29uc3Qgc3RydWN0 IGFtZGdwdV9yaW5nX2Z1bmNzIHNkbWFfdjRfMF9yaW5nX2Z1bmNzXzJuZF9tbWh1YiA9IHsKKwku dHlwZSA9IEFNREdQVV9SSU5HX1RZUEVfU0RNQSwKKwkuYWxpZ25fbWFzayA9IDB4ZiwKKwkubm9w ID0gU0RNQV9QS1RfTk9QX0hFQURFUl9PUChTRE1BX09QX05PUCksCisJLnN1cHBvcnRfNjRiaXRf cHRycyA9IHRydWUsCisJLnZtaHViID0gQU1ER1BVX01NSFVCXzEsCisJLmdldF9ycHRyID0gc2Rt YV92NF8wX3JpbmdfZ2V0X3JwdHIsCisJLmdldF93cHRyID0gc2RtYV92NF8wX3JpbmdfZ2V0X3dw dHIsCisJLnNldF93cHRyID0gc2RtYV92NF8wX3Jpbmdfc2V0X3dwdHIsCisJLmVtaXRfZnJhbWVf c2l6ZSA9CisJCTYgKyAvKiBzZG1hX3Y0XzBfcmluZ19lbWl0X2hkcF9mbHVzaCAqLworCQkzICsg LyogaGRwIGludmFsaWRhdGUgKi8KKwkJNiArIC8qIHNkbWFfdjRfMF9yaW5nX2VtaXRfcGlwZWxp bmVfc3luYyAqLworCQkvKiBzZG1hX3Y0XzBfcmluZ19lbWl0X3ZtX2ZsdXNoICovCisJCVNPQzE1 X0ZMVVNIX0dQVV9UTEJfTlVNX1dSRUcgKiAzICsKKwkJU09DMTVfRkxVU0hfR1BVX1RMQl9OVU1f UkVHX1dBSVQgKiA2ICsKKwkJMTAgKyAxMCArIDEwLCAvKiBzZG1hX3Y0XzBfcmluZ19lbWl0X2Zl bmNlIHgzIGZvciB1c2VyIGZlbmNlLCB2bSBmZW5jZSAqLworCS5lbWl0X2liX3NpemUgPSA3ICsg NiwgLyogc2RtYV92NF8wX3JpbmdfZW1pdF9pYiAqLworCS5lbWl0X2liID0gc2RtYV92NF8wX3Jp bmdfZW1pdF9pYiwKKwkuZW1pdF9mZW5jZSA9IHNkbWFfdjRfMF9yaW5nX2VtaXRfZmVuY2UsCisJ LmVtaXRfcGlwZWxpbmVfc3luYyA9IHNkbWFfdjRfMF9yaW5nX2VtaXRfcGlwZWxpbmVfc3luYywK KwkuZW1pdF92bV9mbHVzaCA9IHNkbWFfdjRfMF9yaW5nX2VtaXRfdm1fZmx1c2gsCisJLmVtaXRf aGRwX2ZsdXNoID0gc2RtYV92NF8wX3JpbmdfZW1pdF9oZHBfZmx1c2gsCisJLnRlc3RfcmluZyA9 IHNkbWFfdjRfMF9yaW5nX3Rlc3RfcmluZywKKwkudGVzdF9pYiA9IHNkbWFfdjRfMF9yaW5nX3Rl c3RfaWIsCisJLmluc2VydF9ub3AgPSBzZG1hX3Y0XzBfcmluZ19pbnNlcnRfbm9wLAorCS5wYWRf aWIgPSBzZG1hX3Y0XzBfcmluZ19wYWRfaWIsCisJLmVtaXRfd3JlZyA9IHNkbWFfdjRfMF9yaW5n X2VtaXRfd3JlZywKKwkuZW1pdF9yZWdfd2FpdCA9IHNkbWFfdjRfMF9yaW5nX2VtaXRfcmVnX3dh aXQsCisJLmVtaXRfcmVnX3dyaXRlX3JlZ193YWl0ID0gYW1kZ3B1X3JpbmdfZW1pdF9yZWdfd3Jp dGVfcmVnX3dhaXRfaGVscGVyLAorfTsKKwogc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmlu Z19mdW5jcyBzZG1hX3Y0XzBfcGFnZV9yaW5nX2Z1bmNzID0gewogCS50eXBlID0gQU1ER1BVX1JJ TkdfVFlQRV9TRE1BLAogCS5hbGlnbl9tYXNrID0gMHhmLApAQCAtMjI1MCw3ICsyMjg2LDEyIEBA IHN0YXRpYyB2b2lkIHNkbWFfdjRfMF9zZXRfcmluZ19mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldikKIAlpbnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5zZG1hLm51bV9pbnN0 YW5jZXM7IGkrKykgewotCQlhZGV2LT5zZG1hLmluc3RhbmNlW2ldLnJpbmcuZnVuY3MgPSAmc2Rt YV92NF8wX3JpbmdfZnVuY3M7CisJCWlmIChhZGV2LT5hc2ljX3R5cGUgPT0gQ0hJUF9BUkNUVVJV UyAmJiBpID49NSkKKwkJCWFkZXYtPnNkbWEuaW5zdGFuY2VbaV0ucmluZy5mdW5jcyA9CisJCQkJ CSZzZG1hX3Y0XzBfcmluZ19mdW5jc18ybmRfbW1odWI7CisJCWVsc2UKKwkJCWFkZXYtPnNkbWEu aW5zdGFuY2VbaV0ucmluZy5mdW5jcyA9CisJCQkJCSZzZG1hX3Y0XzBfcmluZ19mdW5jczsKIAkJ YWRldi0+c2RtYS5pbnN0YW5jZVtpXS5yaW5nLm1lID0gaTsKIAkJaWYgKGFkZXYtPnNkbWEuaGFz X3BhZ2VfcXVldWUpIHsKIAkJCWFkZXYtPnNkbWEuaW5zdGFuY2VbaV0ucGFnZS5mdW5jcyA9ICZz ZG1hX3Y0XzBfcGFnZV9yaW5nX2Z1bmNzOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZng=