From: Alex Deucher Subject: [PATCH 1/2] drm/amdgpu/gfx9: allocate queues horizontally across pipes Date: Mon, 5 Jun 2017 11:06:32 -0400 Message-ID: <1496675193-4963-1-git-send-email-alexander.deucher@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: Alex Deucher UGlwZXMgcHJvdmlkZSBiZXR0ZXIgY29uY3VycmVuY3kgdGhhbiBxdWV1ZXMsIHRoZXJlZm9yZSB3 ZSB3YW50IHRvIG1ha2UKc3VyZSB0aGF0IGFwcHMgdXNlIHF1ZXVlcyBmcm9tIGRpZmZlcmVudCBw aXBlcyB3aGVuZXZlciBwb3NzaWJsZS4KCk9wdGltaXplIGZvciB0aGUgdHJpdmlhbCBjYXNlIHdo ZXJlIGFuIGFwcCB3aWxsIGNvbnN1bWUgcmluZ3MgaW4gb3JkZXIsCnRoZXJlZm9yZSB3ZSBkb24n dCB3YW50IGFkamFjZW50IHJpbmdzIHRvIGJlbG9uZyB0byB0aGUgc2FtZSBwaXBlLgoKZ2Z4OSB3 YXMgbWlzc2VkIHdoZW4gdGhlc2UgcGF0Y2hlcyB3ZXJlIHJlYmFzZWQuCgpTaWduZWQtb2ZmLWJ5 OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYyB8IDExNSArKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTIgaW5zZXJ0aW9ucygrKSwgNjMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKaW5kZXggOTUwMjM1My4u MGM0OGY2YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCkBAIC0xNDgzLDkg KzE0ODMsNDQgQEAgc3RhdGljIGludCBnZnhfdjlfMF9uZ2dfZW4oc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgZ2Z4X3Y5XzBfY29tcHV0ZV9y aW5nX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGludCByaW5nX2lkLAorCQkJCSAg ICAgIGludCBtZWMsIGludCBwaXBlLCBpbnQgcXVldWUpCit7CisJaW50IHI7CisJdW5zaWduZWQg aXJxX3R5cGU7CisJc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRl X3JpbmdbcmluZ19pZF07CisKKwlyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRlX3JpbmdbcmluZ19p ZF07CisKKwkvKiBtZWMwIGlzIG1lMSAqLworCXJpbmctPm1lID0gbWVjICsgMTsKKwlyaW5nLT5w aXBlID0gcGlwZTsKKwlyaW5nLT5xdWV1ZSA9IHF1ZXVlOworCisJcmluZy0+cmluZ19vYmogPSBO VUxMOworCXJpbmctPnVzZV9kb29yYmVsbCA9IHRydWU7CisJcmluZy0+ZG9vcmJlbGxfaW5kZXgg PSBBTURHUFVfRE9PUkJFTExfTUVDX1JJTkcwICsgcmluZ19pZDsKKwlyaW5nLT5lb3BfZ3B1X2Fk ZHIgPSBhZGV2LT5nZngubWVjLmhwZF9lb3BfZ3B1X2FkZHIKKwkJCQkrIChyaW5nX2lkICogR0ZY OV9NRUNfSFBEX1NJWkUpOworCXNwcmludGYocmluZy0+bmFtZSwgImNvbXBfJWQuJWQuJWQiLCBy aW5nLT5tZSwgcmluZy0+cGlwZSwgcmluZy0+cXVldWUpOworCisJaXJxX3R5cGUgPSBBTURHUFVf Q1BfSVJRX0NPTVBVVEVfTUVDMV9QSVBFMF9FT1AKKwkJKyAoKHJpbmctPm1lIC0gMSkgKiBhZGV2 LT5nZngubWVjLm51bV9waXBlX3Blcl9tZWMpCisJCSsgcmluZy0+cGlwZTsKKworCS8qIHR5cGUt MiBwYWNrZXRzIGFyZSBkZXByZWNhdGVkIG9uIE1FQywgdXNlIHR5cGUtMyBpbnN0ZWFkICovCisJ ciA9IGFtZGdwdV9yaW5nX2luaXQoYWRldiwgcmluZywgMTAyNCwKKwkJCSAgICAgJmFkZXYtPmdm eC5lb3BfaXJxLCBpcnFfdHlwZSk7CisJaWYgKHIpCisJCXJldHVybiByOworCisKKwlyZXR1cm4g MDsKK30KKwogc3RhdGljIGludCBnZnhfdjlfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIHsKLQlp bnQgaSwgciwgcmluZ19pZDsKKwlpbnQgaSwgaiwgaywgciwgcmluZ19pZDsKIAlzdHJ1Y3QgYW1k Z3B1X3JpbmcgKnJpbmc7CiAJc3RydWN0IGFtZGdwdV9raXEgKmtpcTsKIAlzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKQEAgLTE1NDcs NjkgKzE1ODIsMjMgQEAgc3RhdGljIGludCBnZnhfdjlfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkK IAkJCXJldHVybiByOwogCX0KIAotCS8qIHNldCB1cCB0aGUgY29tcHV0ZSBxdWV1ZXMgKi8KLQlm b3IgKGkgPSAwLCByaW5nX2lkID0gMDsgaSA8IEFNREdQVV9NQVhfQ09NUFVURV9RVUVVRVM7IGkr KykgewotCQl1bnNpZ25lZCBpcnFfdHlwZTsKLQotCQlpZiAoIXRlc3RfYml0KGksIGFkZXYtPmdm eC5tZWMucXVldWVfYml0bWFwKSkKLQkJCWNvbnRpbnVlOwotCi0JCWlmIChXQVJOX09OKHJpbmdf aWQgPj0gQU1ER1BVX01BWF9DT01QVVRFX1JJTkdTKSkKLQkJCWJyZWFrOwotCi0JCXJpbmcgPSAm YWRldi0+Z2Z4LmNvbXB1dGVfcmluZ1tyaW5nX2lkXTsKLQotCQkvKiBtZWMwIGlzIG1lMSAqLwot CQlyaW5nLT5tZSA9ICgoaSAvIGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Blcl9waXBlKQotCQkJ CS8gYWRldi0+Z2Z4Lm1lYy5udW1fcGlwZV9wZXJfbWVjKQotCQkJCSsgMTsKLQkJcmluZy0+cGlw ZSA9IChpIC8gYWRldi0+Z2Z4Lm1lYy5udW1fcXVldWVfcGVyX3BpcGUpCi0JCQkJJSBhZGV2LT5n ZngubWVjLm51bV9waXBlX3Blcl9tZWM7Ci0JCXJpbmctPnF1ZXVlID0gaSAlIGFkZXYtPmdmeC5t ZWMubnVtX3F1ZXVlX3Blcl9waXBlOwotCi0JCXJpbmctPnJpbmdfb2JqID0gTlVMTDsKLQkJcmlu Zy0+dXNlX2Rvb3JiZWxsID0gdHJ1ZTsKLQkJcmluZy0+ZW9wX2dwdV9hZGRyID0gYWRldi0+Z2Z4 Lm1lYy5ocGRfZW9wX2dwdV9hZGRyICsgKHJpbmdfaWQgKiBHRlg5X01FQ19IUERfU0laRSk7Ci0J CXJpbmctPmRvb3JiZWxsX2luZGV4ID0gQU1ER1BVX0RPT1JCRUxMX01FQ19SSU5HMCArIHJpbmdf aWQ7Ci0JCXNwcmludGYocmluZy0+bmFtZSwgImNvbXBfJWQuJWQuJWQiLCByaW5nLT5tZSwgcmlu Zy0+cGlwZSwgcmluZy0+cXVldWUpOwotCi0JCWlycV90eXBlID0gQU1ER1BVX0NQX0lSUV9DT01Q VVRFX01FQzFfUElQRTBfRU9QCi0JCQkrICgocmluZy0+bWUgLSAxKSAqIGFkZXYtPmdmeC5tZWMu bnVtX3BpcGVfcGVyX21lYykKLQkJCSsgcmluZy0+cGlwZTsKLQotCQkvKiB0eXBlLTIgcGFja2V0 cyBhcmUgZGVwcmVjYXRlZCBvbiBNRUMsIHVzZSB0eXBlLTMgaW5zdGVhZCAqLwotCQlyID0gYW1k Z3B1X3JpbmdfaW5pdChhZGV2LCByaW5nLCAxMDI0LCAmYWRldi0+Z2Z4LmVvcF9pcnEsCi0JCQkJ ICAgICBpcnFfdHlwZSk7Ci0JCWlmIChyKQotCQkJcmV0dXJuIHI7Ci0KLQkJcmluZ19pZCsrOwot CX0KLQotCS8qIHNldCB1cCB0aGUgY29tcHV0ZSBxdWV1ZXMgKi8KLQlmb3IgKGkgPSAwLCByaW5n X2lkID0gMDsgaSA8IEFNREdQVV9NQVhfQ09NUFVURV9RVUVVRVM7IGkrKykgewotCQl1bnNpZ25l ZCBpcnFfdHlwZTsKLQotCQkvKiBtYXggMzIgcXVldWVzIHBlciBNRUMgKi8KLQkJaWYgKChpID49 IDMyKSB8fCAoaSA+PSBBTURHUFVfTUFYX0NPTVBVVEVfUklOR1MpKSB7Ci0JCQlEUk1fRVJST1Io IlRvbyBtYW55ICglZCkgY29tcHV0ZSByaW5ncyFcbiIsIGkpOwotCQkJYnJlYWs7CisJLyogc2V0 IHVwIHRoZSBjb21wdXRlIHF1ZXVlcyAtIGFsbG9jYXRlIGhvcml6b250YWxseSBhY3Jvc3MgcGlw ZXMgKi8KKwlyaW5nX2lkID0gMDsKKwlmb3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm1lYy5udW1f bWVjOyArK2kpIHsKKwkJZm9yIChqID0gMDsgaiA8IGFkZXYtPmdmeC5tZWMubnVtX3F1ZXVlX3Bl cl9waXBlOyBqKyspIHsKKwkJCWZvciAoayA9IDA7IGsgPCBhZGV2LT5nZngubWVjLm51bV9waXBl X3Blcl9tZWM7IGsrKykgeworCQkJCWlmICghYW1kZ3B1X2lzX21lY19xdWV1ZV9lbmFibGVkKGFk ZXYsIGksIGssIGopKQorCQkJCQljb250aW51ZTsKKworCQkJCXIgPSBnZnhfdjlfMF9jb21wdXRl X3JpbmdfaW5pdChhZGV2LAorCQkJCQkJCSAgICAgICByaW5nX2lkLAorCQkJCQkJCSAgICAgICBp LCBrLCBqKTsKKwkJCQlpZiAocikKKwkJCQkJcmV0dXJuIHI7CisKKwkJCQlyaW5nX2lkKys7CisJ CQl9CiAJCX0KLQkJcmluZyA9ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5nW2ldOwotCQlyaW5nLT5y aW5nX29iaiA9IE5VTEw7Ci0JCXJpbmctPnVzZV9kb29yYmVsbCA9IHRydWU7Ci0JCXJpbmctPmRv b3JiZWxsX2luZGV4ID0gKEFNREdQVV9ET09SQkVMTDY0X01FQ19SSU5HMCArIGkpIDw8IDE7Ci0J CXJpbmctPm1lID0gMTsgLyogZmlyc3QgTUVDICovCi0JCXJpbmctPnBpcGUgPSBpIC8gODsKLQkJ cmluZy0+cXVldWUgPSBpICUgODsKLQkJcmluZy0+ZW9wX2dwdV9hZGRyID0gYWRldi0+Z2Z4Lm1l Yy5ocGRfZW9wX2dwdV9hZGRyICsgKGkgKiBHRlg5X01FQ19IUERfU0laRSk7Ci0JCXNwcmludGYo cmluZy0+bmFtZSwgImNvbXBfJWQuJWQuJWQiLCByaW5nLT5tZSwgcmluZy0+cGlwZSwgcmluZy0+ cXVldWUpOwotCQlpcnFfdHlwZSA9IEFNREdQVV9DUF9JUlFfQ09NUFVURV9NRUMxX1BJUEUwX0VP UCArIHJpbmctPnBpcGU7Ci0JCS8qIHR5cGUtMiBwYWNrZXRzIGFyZSBkZXByZWNhdGVkIG9uIE1F QywgdXNlIHR5cGUtMyBpbnN0ZWFkICovCi0JCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJp bmcsIDEwMjQsCi0JCQkJICAgICAmYWRldi0+Z2Z4LmVvcF9pcnEsIGlycV90eXBlKTsKLQkJaWYg KHIpCi0JCQlyZXR1cm4gcjsKIAl9CiAKIAlyID0gZ2Z4X3Y5XzBfa2lxX2luaXQoYWRldik7Ci0t IAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K YW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==