From: Alex Deucher Subject: [PATCH 3/5] drm/amdgpu/gfx9: move SET_RESOURCES into the same command stream Date: Thu, 11 May 2017 14:35:28 -0400 Message-ID: <1494527730-30128-4-git-send-email-alexander.deucher@amd.com> References: <1494527730-30128-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: In-Reply-To: <1494527730-30128-1-git-send-email-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 QXMgdGhlIEtDUSBzZXR1cC4gIFRoaXMgd2F5IHdlIG9ubHkgaGF2ZSB0byB3YWl0IG9uY2UgZm9y IHRoZQplbnRpcmUgTUVDLgoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIu ZGV1Y2hlckBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8w LmMgfCA3MyArKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDE0IGluc2VydGlvbnMoKyksIDU5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9nZnhfdjlfMC5jCmluZGV4IDdiZTcxZmIuLjkwNTE1OTAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y5XzAuYwpAQCAtMjQ3OCw1OSArMjQ3OCw3IEBAIHN0YXRpYyB2b2lkIGdm eF92OV8wX2tpcV9zZXR0aW5nKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAlXUkVHMzJfU09D MTUoR0MsIDAsIG1tUkxDX0NQX1NDSEVEVUxFUlMsIHRtcCk7CiB9CiAKLXN0YXRpYyBpbnQgZ2Z4 X3Y5XzBfa2lxX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCi17Ci0Jc3RydWN0IGFt ZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5nLT5hZGV2OwotCXVpbnQzMl90IHNjcmF0Y2gsIHRtcCA9 IDA7Ci0JaW50IHIsIGk7Ci0KLQlyID0gYW1kZ3B1X2dmeF9zY3JhdGNoX2dldChhZGV2LCAmc2Ny YXRjaCk7Ci0JaWYgKHIpIHsKLQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gZ2V0IHNjcmF0Y2ggcmVn ICglZCkuXG4iLCByKTsKLQkJcmV0dXJuIHI7Ci0JfQotCVdSRUczMihzY3JhdGNoLCAweENBRkVE RUFEKTsKLQotCXIgPSBhbWRncHVfcmluZ19hbGxvYyhyaW5nLCA4KTsKLQlpZiAocikgewotCQlE Uk1fRVJST1IoIkZhaWxlZCB0byBsb2NrIEtJUSAoJWQpLlxuIiwgcik7Ci0JCWFtZGdwdV9nZnhf c2NyYXRjaF9mcmVlKGFkZXYsIHNjcmF0Y2gpOwotCQlyZXR1cm4gcjsKLQl9Ci0JYW1kZ3B1X3Jp bmdfYWxsb2MocmluZywgMTEpOwotCS8qIHNldCByZXNvdXJjZXMgKi8KLQlhbWRncHVfcmluZ193 cml0ZShyaW5nLCBQQUNLRVQzKFBBQ0tFVDNfU0VUX1JFU09VUkNFUywgNikpOwotCWFtZGdwdV9y aW5nX3dyaXRlKHJpbmcsIFBBQ0tFVDNfU0VUX1JFU09VUkNFU19WTUlEX01BU0soMCkgfAotCQkJ ICBQQUNLRVQzX1NFVF9SRVNPVVJDRVNfUVVFVUVfVFlQRSgwKSk7CS8qIHZtaWRfbWFzazowIHF1 ZXVlX3R5cGU6MCAoS0lRKSAqLwotCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIDB4MDAwMDAwRkYp OwkvKiBxdWV1ZSBtYXNrIGxvICovCi0JYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIHF1 ZXVlIG1hc2sgaGkgKi8KLQlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsJLyogZ3dzIG1hc2sg bG8gKi8KLQlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsJLyogZ3dzIG1hc2sgaGkgKi8KLQlh bWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsJLyogb2FjIG1hc2sgKi8KLQlhbWRncHVfcmluZ193 cml0ZShyaW5nLCAwKTsJLyogZ2RzIGhlYXAgYmFzZTowLCBnZHMgaGVhcCBzaXplOjAgKi8KLQkv KiB3cml0ZSB0byBzY3JhdGNoIGZvciBjb21wbGV0aW9uICovCi0JYW1kZ3B1X3Jpbmdfd3JpdGUo cmluZywgUEFDS0VUMyhQQUNLRVQzX1NFVF9VQ09ORklHX1JFRywgMSkpOwotCWFtZGdwdV9yaW5n X3dyaXRlKHJpbmcsIChzY3JhdGNoIC0gUEFDS0VUM19TRVRfVUNPTkZJR19SRUdfU1RBUlQpKTsK LQlhbWRncHVfcmluZ193cml0ZShyaW5nLCAweERFQURCRUVGKTsKLQlhbWRncHVfcmluZ19jb21t aXQocmluZyk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXNlY190aW1lb3V0OyBpKyspIHsK LQkJdG1wID0gUlJFRzMyKHNjcmF0Y2gpOwotCQlpZiAodG1wID09IDB4REVBREJFRUYpCi0JCQli cmVhazsKLQkJRFJNX1VERUxBWSgxKTsKLQl9Ci0JaWYgKGkgPj0gYWRldi0+dXNlY190aW1lb3V0 KSB7Ci0JCURSTV9FUlJPUigiS0lRIGVuYWJsZSBmYWlsZWQgKHNjcmF0Y2goMHglMDRYKT0weCUw OFgpXG4iLAotCQkJICBzY3JhdGNoLCB0bXApOwotCQlyID0gLUVJTlZBTDsKLQl9Ci0JYW1kZ3B1 X2dmeF9zY3JhdGNoX2ZyZWUoYWRldiwgc2NyYXRjaCk7Ci0KLQlyZXR1cm4gcjsKLX0KLQotc3Rh dGljIGludCBnZnhfdjlfMF9tYXBfcXVldWVzX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldikKK3N0YXRpYyBpbnQgZ2Z4X3Y5XzBfa2lxX2tjcV9lbmFibGUoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpCiB7CiAJc3RydWN0IGFtZGdwdV9yaW5nICpraXFfcmluZyA9ICZhZGV2LT5n Zngua2lxLnJpbmc7CiAJdWludDMyX3Qgc2NyYXRjaCwgdG1wID0gMDsKQEAgLTI1NDMsMTMgKzI0 OTEsMjMgQEAgc3RhdGljIGludCBnZnhfdjlfMF9tYXBfcXVldWVzX2VuYWJsZShzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldikKIAl9CiAJV1JFRzMyKHNjcmF0Y2gsIDB4Q0FGRURFQUQpOwogCi0J ciA9IGFtZGdwdV9yaW5nX2FsbG9jKGtpcV9yaW5nLCAoNyAqIGFkZXYtPmdmeC5udW1fY29tcHV0 ZV9yaW5ncykgKyAzKTsKKwlyID0gYW1kZ3B1X3JpbmdfYWxsb2Moa2lxX3JpbmcsICg3ICogYWRl di0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzKSArIDExKTsKIAlpZiAocikgewogCQlEUk1fRVJST1Io IkZhaWxlZCB0byBsb2NrIEtJUSAoJWQpLlxuIiwgcik7CiAJCWFtZGdwdV9nZnhfc2NyYXRjaF9m cmVlKGFkZXYsIHNjcmF0Y2gpOwogCQlyZXR1cm4gcjsKIAl9CiAKKwkvKiBzZXQgcmVzb3VyY2Vz ICovCisJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIFBBQ0tFVDMoUEFDS0VUM19TRVRfUkVT T1VSQ0VTLCA2KSk7CisJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIFBBQ0tFVDNfU0VUX1JF U09VUkNFU19WTUlEX01BU0soMCkgfAorCQkJICBQQUNLRVQzX1NFVF9SRVNPVVJDRVNfUVVFVUVf VFlQRSgwKSk7CS8qIHZtaWRfbWFzazowIHF1ZXVlX3R5cGU6MCAoS0lRKSAqLworCWFtZGdwdV9y aW5nX3dyaXRlKGtpcV9yaW5nLCAweDAwMDAwMEZGKTsJLyogcXVldWUgbWFzayBsbyAqLworCWFt ZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsJLyogcXVldWUgbWFzayBoaSAqLworCWFtZGdw dV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsJLyogZ3dzIG1hc2sgbG8gKi8KKwlhbWRncHVfcmlu Z193cml0ZShraXFfcmluZywgMCk7CS8qIGd3cyBtYXNrIGhpICovCisJYW1kZ3B1X3Jpbmdfd3Jp dGUoa2lxX3JpbmcsIDApOwkvKiBvYWMgbWFzayAqLworCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9y aW5nLCAwKTsJLyogZ2RzIGhlYXAgYmFzZTowLCBnZHMgaGVhcCBzaXplOjAgKi8KIAlmb3IgKGkg PSAwOyBpIDwgYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKIAkJc3RydWN0IGFt ZGdwdV9yaW5nICpyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRlX3JpbmdbaV07CiAJCXVpbnQ2NF90 IG1xZF9hZGRyID0gYW1kZ3B1X2JvX2dwdV9vZmZzZXQocmluZy0+bXFkX29iaik7CkBAIC0yODM2 LDcgKzI3OTQsNiBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9pbml0X3F1ZXVlKHN0cnVjdCBh bWRncHVfcmluZyAqcmluZykKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFk ZXY7CiAJc3RydWN0IHY5X21xZCAqbXFkID0gcmluZy0+bXFkX3B0cjsKIAlpbnQgbXFkX2lkeCA9 IEFNREdQVV9NQVhfQ09NUFVURV9SSU5HUzsKLQlpbnQgcjsKIAogCWdmeF92OV8wX2tpcV9zZXR0 aW5nKHJpbmcpOwogCkBAIC0yODY3LDkgKzI4MjQsNyBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tp cV9pbml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAkJbXV0ZXhfdW5sb2NrKCZh ZGV2LT5zcmJtX211dGV4KTsKIAl9CiAKLQlyID0gZ2Z4X3Y5XzBfa2lxX2VuYWJsZShyaW5nKTsK LQotCXJldHVybiByOworCXJldHVybiAwOwogfQogCiBzdGF0aWMgaW50IGdmeF92OV8wX2tjcV9p bml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKQEAgLTI5NDEsNyArMjg5Niw3IEBA IHN0YXRpYyBpbnQgZ2Z4X3Y5XzBfa2lxX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dikKIAkJCWdvdG8gZG9uZTsKIAl9CiAKLQlyID0gZ2Z4X3Y5XzBfbWFwX3F1ZXVlc19lbmFibGUo YWRldik7CisJciA9IGdmeF92OV8wX2tpcV9rY3FfZW5hYmxlKGFkZXYpOwogZG9uZToKIAlyZXR1 cm4gcjsKIH0KLS0gCjIuNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1n ZngK