From: Alex Deucher Subject: [PATCH 07/12] drm/amdgpu/gfx9: wait for completion in KIQ init Date: Mon, 17 Apr 2017 18:00:42 -0400 Message-ID: <1492466447-27614-8-git-send-email-alexander.deucher@amd.com> References: <1492466447-27614-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: <1492466447-27614-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 V2UgbmVlZCB0byBtYWtlIHN1cmUgdGhlIHZhcmlvdXMgaW5pdCBzZXF1ZW5jZXMgc3VibWl0dGVk CnRvIEtJUSBjb21wbGV0ZSBiZWZvcmUgdGVzdGluZyB0aGUgcmluZ3MuCgpTaWduZWQtb2ZmLWJ5 OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYyB8IDg5ICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNzkgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKaW5kZXggMjA5NTliYy4u MDk3YTUyNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCkBAIC0xODM5LDkg KzE4MzksMjYgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfa2lxX3NldHRpbmcoc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nKQogCVdSRUczMl9TT0MxNShHQywgMCwgbW1STENfQ1BfU0NIRURVTEVSUywg dG1wKTsKIH0KIAotc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfa2lxX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcpCitzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9lbmFibGUoc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nKQogewotCWFtZGdwdV9yaW5nX2FsbG9jKHJpbmcsIDgpOworCXN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsKKwl1aW50MzJfdCBzY3JhdGNoLCB0bXAg PSAwOworCWludCByLCBpOworCisJciA9IGFtZGdwdV9nZnhfc2NyYXRjaF9nZXQoYWRldiwgJnNj cmF0Y2gpOworCWlmIChyKSB7CisJCURSTV9FUlJPUigiRmFpbGVkIHRvIGdldCBzY3JhdGNoIHJl ZyAoJWQpLlxuIiwgcik7CisJCXJldHVybiByOworCX0KKwlXUkVHMzIoc2NyYXRjaCwgMHhDQUZF REVBRCk7CisKKwlyID0gYW1kZ3B1X3JpbmdfYWxsb2MocmluZywgOCk7CisJaWYgKHIpIHsKKwkJ RFJNX0VSUk9SKCJGYWlsZWQgdG8gbG9jayBLSVEgKCVkKS5cbiIsIHIpOworCQlhbWRncHVfZ2Z4 X3NjcmF0Y2hfZnJlZShhZGV2LCBzY3JhdGNoKTsKKwkJcmV0dXJuIHI7CisJfQorCWFtZGdwdV9y aW5nX2FsbG9jKHJpbmcsIDExKTsKIAkvKiBzZXQgcmVzb3VyY2VzICovCiAJYW1kZ3B1X3Jpbmdf d3JpdGUocmluZywgUEFDS0VUMyhQQUNLRVQzX1NFVF9SRVNPVVJDRVMsIDYpKTsKIAlhbWRncHVf cmluZ193cml0ZShyaW5nLCBQQUNLRVQzX1NFVF9SRVNPVVJDRVNfVk1JRF9NQVNLKDApIHwKQEAg LTE4NTIsMTkgKzE4NjksNTIgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfa2lxX2VuYWJsZShzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIGd3 cyBtYXNrIGhpICovCiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIG9hYyBtYXNrICov CiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIGdkcyBoZWFwIGJhc2U6MCwgZ2RzIGhl YXAgc2l6ZTowICovCisJLyogd3JpdGUgdG8gc2NyYXRjaCBmb3IgY29tcGxldGlvbiAqLworCWFt ZGdwdV9yaW5nX3dyaXRlKHJpbmcsIFBBQ0tFVDMoUEFDS0VUM19TRVRfVUNPTkZJR19SRUcsIDEp KTsKKwlhbWRncHVfcmluZ193cml0ZShyaW5nLCAoc2NyYXRjaCAtIFBBQ0tFVDNfU0VUX1VDT05G SUdfUkVHX1NUQVJUKSk7CisJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMHhERUFEQkVFRik7CiAJ YW1kZ3B1X3JpbmdfY29tbWl0KHJpbmcpOwotCXVkZWxheSg1MCk7CisKKwlmb3IgKGkgPSAwOyBp IDwgYWRldi0+dXNlY190aW1lb3V0OyBpKyspIHsKKwkJdG1wID0gUlJFRzMyKHNjcmF0Y2gpOwor CQlpZiAodG1wID09IDB4REVBREJFRUYpCisJCQlicmVhazsKKwkJRFJNX1VERUxBWSgxKTsKKwl9 CisJaWYgKGkgPj0gYWRldi0+dXNlY190aW1lb3V0KSB7CisJCURSTV9FUlJPUigiS0lRIGVuYWJs ZSBmYWlsZWQgKHNjcmF0Y2goMHglMDRYKT0weCUwOFgpXG4iLAorCQkJICBzY3JhdGNoLCB0bXAp OworCQlyID0gLUVJTlZBTDsKKwl9CisJYW1kZ3B1X2dmeF9zY3JhdGNoX2ZyZWUoYWRldiwgc2Ny YXRjaCk7CisKKwlyZXR1cm4gcjsKIH0KIAotc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfbWFwX3F1ZXVl X2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKmtpcV9yaW5nLAotCQkJCSAgIHN0cnVjdCBhbWRn cHVfcmluZyAqcmluZykKK3N0YXRpYyBpbnQgZ2Z4X3Y5XzBfbWFwX3F1ZXVlX2VuYWJsZShzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKmtpcV9yaW5nLAorCQkJCSAgICAgc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0ga2lxX3JpbmctPmFkZXY7CiAJ dWludDY0X3QgbXFkX2FkZHIsIHdwdHJfYWRkcjsKKwl1aW50MzJfdCBzY3JhdGNoLCB0bXAgPSAw OworCWludCByLCBpOworCisJciA9IGFtZGdwdV9nZnhfc2NyYXRjaF9nZXQoYWRldiwgJnNjcmF0 Y2gpOworCWlmIChyKSB7CisJCURSTV9FUlJPUigiRmFpbGVkIHRvIGdldCBzY3JhdGNoIHJlZyAo JWQpLlxuIiwgcik7CisJCXJldHVybiByOworCX0KKwlXUkVHMzIoc2NyYXRjaCwgMHhDQUZFREVB RCk7CisKKwlyID0gYW1kZ3B1X3JpbmdfYWxsb2Moa2lxX3JpbmcsIDEwKTsKKwlpZiAocikgewor CQlEUk1fRVJST1IoIkZhaWxlZCB0byBsb2NrIEtJUSAoJWQpLlxuIiwgcik7CisJCWFtZGdwdV9n Znhfc2NyYXRjaF9mcmVlKGFkZXYsIHNjcmF0Y2gpOworCQlyZXR1cm4gcjsKKwl9CiAKIAltcWRf YWRkciA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0KHJpbmctPm1xZF9vYmopOwogCXdwdHJfYWRkciA9 IGFkZXYtPndiLmdwdV9hZGRyICsgKHJpbmctPndwdHJfb2ZmcyAqIDQpOwotCWFtZGdwdV9yaW5n X2FsbG9jKGtpcV9yaW5nLCA4KTsKIAogCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCBQQUNL RVQzKFBBQ0tFVDNfTUFQX1FVRVVFUywgNSkpOwogCS8qIFFfc2VsOjAsIHZtaWQ6MCwgdmlkbWVt OiAxLCBlbmdpbmU6MCwgbnVtX1E6MSovCkBAIC0xODgzLDggKzE5MzMsMjYgQEAgc3RhdGljIHZv aWQgZ2Z4X3Y5XzBfbWFwX3F1ZXVlX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKmtpcV9yaW5n LAogCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCB1cHBlcl8zMl9iaXRzKG1xZF9hZGRyKSk7 CiAJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIGxvd2VyXzMyX2JpdHMod3B0cl9hZGRyKSk7 CiAJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIHVwcGVyXzMyX2JpdHMod3B0cl9hZGRyKSk7 CisJLyogd3JpdGUgdG8gc2NyYXRjaCBmb3IgY29tcGxldGlvbiAqLworCWFtZGdwdV9yaW5nX3dy aXRlKGtpcV9yaW5nLCBQQUNLRVQzKFBBQ0tFVDNfU0VUX1VDT05GSUdfUkVHLCAxKSk7CisJYW1k Z3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIChzY3JhdGNoIC0gUEFDS0VUM19TRVRfVUNPTkZJR19S RUdfU1RBUlQpKTsKKwlhbWRncHVfcmluZ193cml0ZShraXFfcmluZywgMHhERUFEQkVFRik7CiAJ YW1kZ3B1X3JpbmdfY29tbWl0KGtpcV9yaW5nKTsKLQl1ZGVsYXkoNTApOworCisJZm9yIChpID0g MDsgaSA8IGFkZXYtPnVzZWNfdGltZW91dDsgaSsrKSB7CisJCXRtcCA9IFJSRUczMihzY3JhdGNo KTsKKwkJaWYgKHRtcCA9PSAweERFQURCRUVGKQorCQkJYnJlYWs7CisJCURSTV9VREVMQVkoMSk7 CisJfQorCWlmIChpID49IGFkZXYtPnVzZWNfdGltZW91dCkgeworCQlEUk1fRVJST1IoIktDUSBl bmFibGUgZmFpbGVkIChzY3JhdGNoKDB4JTA0WCk9MHglMDhYKVxuIiwKKwkJCSAgc2NyYXRjaCwg dG1wKTsKKwkJciA9IC1FSU5WQUw7CisJfQorCWFtZGdwdV9nZnhfc2NyYXRjaF9mcmVlKGFkZXYs IHNjcmF0Y2gpOworCisJcmV0dXJuIHI7CiB9CiAKIHN0YXRpYyBpbnQgZ2Z4X3Y5XzBfbXFkX2lu aXQoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQpAQCAtMjEzMCw2ICsyMTk4LDcgQEAgc3RhdGlj IGludCBnZnhfdjlfMF9raXFfaW5pdF9xdWV1ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJ c3RydWN0IHY5X21xZCAqbXFkID0gcmluZy0+bXFkX3B0cjsKIAlib29sIGlzX2tpcSA9IChyaW5n LT5mdW5jcy0+dHlwZSA9PSBBTURHUFVfUklOR19UWVBFX0tJUSk7CiAJaW50IG1xZF9pZHggPSBB TURHUFVfTUFYX0NPTVBVVEVfUklOR1M7CisJaW50IHI7CiAKIAlpZiAoaXNfa2lxKSB7CiAJCWdm eF92OV8wX2tpcV9zZXR0aW5nKCZraXEtPnJpbmcpOwpAQCAtMjE2OCwxMSArMjIzNywxMSBAQCBz dGF0aWMgaW50IGdmeF92OV8wX2tpcV9pbml0X3F1ZXVlKHN0cnVjdCBhbWRncHVfcmluZyAqcmlu ZykKIAl9CiAKIAlpZiAoaXNfa2lxKQotCQlnZnhfdjlfMF9raXFfZW5hYmxlKHJpbmcpOworCQly ID0gZ2Z4X3Y5XzBfa2lxX2VuYWJsZShyaW5nKTsKIAllbHNlCi0JCWdmeF92OV8wX21hcF9xdWV1 ZV9lbmFibGUoJmtpcS0+cmluZywgcmluZyk7CisJCXIgPSBnZnhfdjlfMF9tYXBfcXVldWVfZW5h YmxlKCZraXEtPnJpbmcsIHJpbmcpOwogCi0JcmV0dXJuIDA7CisJcmV0dXJuIHI7CiB9CiAKIHN0 YXRpYyBpbnQgZ2Z4X3Y5XzBfa2lxX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK LS0gCjIuNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK