From: Alex Deucher Subject: [PATCH 09/12] drm/amdgpu/gfx9: wait once for all KCQs to be created Date: Mon, 17 Apr 2017 18:00:44 -0400 Message-ID: <1492466447-27614-10-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 UmF0aGVyIHRoYW4gd2FpdGluZyBmb3IgZWFjaCBxdWV1ZS4KClNpZ25lZC1vZmYtYnk6IEFsZXgg RGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nZnhfdjlfMC5jIHwgNjAgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAuYwppbmRleCA4MTVmOTg1Li4xMDkzMGQ0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKQEAgLTE4OTEsMTEgKzE4OTEs OSBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9lbmFibGUoc3RydWN0IGFtZGdwdV9yaW5nICpy aW5nKQogCXJldHVybiByOwogfQogCi1zdGF0aWMgaW50IGdmeF92OV8wX21hcF9xdWV1ZV9lbmFi bGUoc3RydWN0IGFtZGdwdV9yaW5nICpraXFfcmluZywKLQkJCQkgICAgIHN0cnVjdCBhbWRncHVf cmluZyAqcmluZykKK3N0YXRpYyBpbnQgZ2Z4X3Y5XzBfbWFwX3F1ZXVlc19lbmFibGUoc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBr aXFfcmluZy0+YWRldjsKLQl1aW50NjRfdCBtcWRfYWRkciwgd3B0cl9hZGRyOworCXN0cnVjdCBh bWRncHVfcmluZyAqa2lxX3JpbmcgPSAmYWRldi0+Z2Z4LmtpcS5yaW5nOwogCXVpbnQzMl90IHNj cmF0Y2gsIHRtcCA9IDA7CiAJaW50IHIsIGk7CiAKQEAgLTE5MDYsMzMgKzE5MDQsMzYgQEAgc3Rh dGljIGludCBnZnhfdjlfMF9tYXBfcXVldWVfZW5hYmxlKHN0cnVjdCBhbWRncHVfcmluZyAqa2lx X3JpbmcsCiAJfQogCVdSRUczMihzY3JhdGNoLCAweENBRkVERUFEKTsKIAotCXIgPSBhbWRncHVf cmluZ19hbGxvYyhraXFfcmluZywgMTApOworCXIgPSBhbWRncHVfcmluZ19hbGxvYyhraXFfcmlu ZywgKDcgKiBhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3MpICsgMyk7CiAJaWYgKHIpIHsKIAkJ RFJNX0VSUk9SKCJGYWlsZWQgdG8gbG9jayBLSVEgKCVkKS5cbiIsIHIpOwogCQlhbWRncHVfZ2Z4 X3NjcmF0Y2hfZnJlZShhZGV2LCBzY3JhdGNoKTsKIAkJcmV0dXJuIHI7CiAJfQogCi0JbXFkX2Fk ZHIgPSBhbWRncHVfYm9fZ3B1X29mZnNldChyaW5nLT5tcWRfb2JqKTsKLQl3cHRyX2FkZHIgPSBh ZGV2LT53Yi5ncHVfYWRkciArIChyaW5nLT53cHRyX29mZnMgKiA0KTsKLQotCWFtZGdwdV9yaW5n X3dyaXRlKGtpcV9yaW5nLCBQQUNLRVQzKFBBQ0tFVDNfTUFQX1FVRVVFUywgNSkpOwotCS8qIFFf c2VsOjAsIHZtaWQ6MCwgdmlkbWVtOiAxLCBlbmdpbmU6MCwgbnVtX1E6MSovCi0JYW1kZ3B1X3Jp bmdfd3JpdGUoa2lxX3JpbmcsIC8qIFFfc2VsOiAwLCB2bWlkOiAwLCBlbmdpbmU6IDAsIG51bV9R OiAxICovCi0JCQkgIFBBQ0tFVDNfTUFQX1FVRVVFU19RVUVVRV9TRUwoMCkgfCAvKiBRdWV1ZV9T ZWwgKi8KLQkJCSAgUEFDS0VUM19NQVBfUVVFVUVTX1ZNSUQoMCkgfCAvKiBWTUlEICovCi0JCQkg IFBBQ0tFVDNfTUFQX1FVRVVFU19RVUVVRShyaW5nLT5xdWV1ZSkgfAotCQkJICBQQUNLRVQzX01B UF9RVUVVRVNfUElQRShyaW5nLT5waXBlKSB8Ci0JCQkgIFBBQ0tFVDNfTUFQX1FVRVVFU19NRSgo cmluZy0+bWUgPT0gMSA/IDAgOiAxKSkgfAotCQkJICBQQUNLRVQzX01BUF9RVUVVRVNfUVVFVUVf VFlQRSgwKSB8IC8qcXVldWVfdHlwZTogbm9ybWFsIGNvbXB1dGUgcXVldWUgKi8KLQkJCSAgUEFD S0VUM19NQVBfUVVFVUVTX0FMTE9DX0ZPUk1BVCgxKSB8IC8qIGFsbG9jIGZvcm1hdDogYWxsX29u X29uZV9waXBlICovCi0JCQkgIFBBQ0tFVDNfTUFQX1FVRVVFU19FTkdJTkVfU0VMKDApIHwgLyog ZW5naW5lX3NlbDogY29tcHV0ZSAqLwotCQkJICBQQUNLRVQzX01BUF9RVUVVRVNfTlVNX1FVRVVF UygxKSk7IC8qIG51bV9xdWV1ZXM6IG11c3QgYmUgMSAqLwotCWFtZGdwdV9yaW5nX3dyaXRlKGtp cV9yaW5nLCBQQUNLRVQzX01BUF9RVUVVRVNfRE9PUkJFTExfT0ZGU0VUKHJpbmctPmRvb3JiZWxs X2luZGV4KSk7Ci0JYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIGxvd2VyXzMyX2JpdHMobXFk X2FkZHIpKTsKLQlhbWRncHVfcmluZ193cml0ZShraXFfcmluZywgdXBwZXJfMzJfYml0cyhtcWRf YWRkcikpOwotCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCBsb3dlcl8zMl9iaXRzKHdwdHJf YWRkcikpOwotCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCB1cHBlcl8zMl9iaXRzKHdwdHJf YWRkcikpOworCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5nZngubnVtX2NvbXB1dGVfcmluZ3M7IGkr KykgeworCQlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcgPSAmYWRldi0+Z2Z4LmNvbXB1dGVfcmlu Z1tpXTsKKwkJdWludDY0X3QgbXFkX2FkZHIgPSBhbWRncHVfYm9fZ3B1X29mZnNldChyaW5nLT5t cWRfb2JqKTsKKwkJdWludDY0X3Qgd3B0cl9hZGRyID0gYWRldi0+d2IuZ3B1X2FkZHIgKyAocmlu Zy0+d3B0cl9vZmZzICogNCk7CisKKwkJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIFBBQ0tF VDMoUEFDS0VUM19NQVBfUVVFVUVTLCA1KSk7CisJCS8qIFFfc2VsOjAsIHZtaWQ6MCwgdmlkbWVt OiAxLCBlbmdpbmU6MCwgbnVtX1E6MSovCisJCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAv KiBRX3NlbDogMCwgdm1pZDogMCwgZW5naW5lOiAwLCBudW1fUTogMSAqLworCQkJCSAgUEFDS0VU M19NQVBfUVVFVUVTX1FVRVVFX1NFTCgwKSB8IC8qIFF1ZXVlX1NlbCAqLworCQkJCSAgUEFDS0VU M19NQVBfUVVFVUVTX1ZNSUQoMCkgfCAvKiBWTUlEICovCisJCQkJICBQQUNLRVQzX01BUF9RVUVV RVNfUVVFVUUocmluZy0+cXVldWUpIHwKKwkJCQkgIFBBQ0tFVDNfTUFQX1FVRVVFU19QSVBFKHJp bmctPnBpcGUpIHwKKwkJCQkgIFBBQ0tFVDNfTUFQX1FVRVVFU19NRSgocmluZy0+bWUgPT0gMSA/ IDAgOiAxKSkgfAorCQkJCSAgUEFDS0VUM19NQVBfUVVFVUVTX1FVRVVFX1RZUEUoMCkgfCAvKnF1 ZXVlX3R5cGU6IG5vcm1hbCBjb21wdXRlIHF1ZXVlICovCisJCQkJICBQQUNLRVQzX01BUF9RVUVV RVNfQUxMT0NfRk9STUFUKDEpIHwgLyogYWxsb2MgZm9ybWF0OiBhbGxfb25fb25lX3BpcGUgKi8K KwkJCQkgIFBBQ0tFVDNfTUFQX1FVRVVFU19FTkdJTkVfU0VMKDApIHwgLyogZW5naW5lX3NlbDog Y29tcHV0ZSAqLworCQkJCSAgUEFDS0VUM19NQVBfUVVFVUVTX05VTV9RVUVVRVMoMSkpOyAvKiBu dW1fcXVldWVzOiBtdXN0IGJlIDEgKi8KKwkJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIFBB Q0tFVDNfTUFQX1FVRVVFU19ET09SQkVMTF9PRkZTRVQocmluZy0+ZG9vcmJlbGxfaW5kZXgpKTsK KwkJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIGxvd2VyXzMyX2JpdHMobXFkX2FkZHIpKTsK KwkJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIHVwcGVyXzMyX2JpdHMobXFkX2FkZHIpKTsK KwkJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIGxvd2VyXzMyX2JpdHMod3B0cl9hZGRyKSk7 CisJCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCB1cHBlcl8zMl9iaXRzKHdwdHJfYWRkcikp OworCX0KIAkvKiB3cml0ZSB0byBzY3JhdGNoIGZvciBjb21wbGV0aW9uICovCiAJYW1kZ3B1X3Jp bmdfd3JpdGUoa2lxX3JpbmcsIFBBQ0tFVDMoUEFDS0VUM19TRVRfVUNPTkZJR19SRUcsIDEpKTsK IAlhbWRncHVfcmluZ193cml0ZShraXFfcmluZywgKHNjcmF0Y2ggLSBQQUNLRVQzX1NFVF9VQ09O RklHX1JFR19TVEFSVCkpOwpAQCAtMjIzNSwxMCArMjIzNiw4IEBAIHN0YXRpYyBpbnQgZ2Z4X3Y5 XzBfa2lxX2luaXRfcXVldWUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogc3RhdGljIGludCBn ZnhfdjlfMF9rY3FfaW5pdF9xdWV1ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiB7CiAJc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5nLT5hZGV2OwotCXN0cnVjdCBhbWRncHVfa2lx ICpraXEgPSAmYWRldi0+Z2Z4LmtpcTsKIAlzdHJ1Y3QgdjlfbXFkICptcWQgPSByaW5nLT5tcWRf cHRyOwogCWludCBtcWRfaWR4ID0gcmluZyAtICZhZGV2LT5nZnguY29tcHV0ZV9yaW5nWzBdOwot CWludCByOwogCiAJaWYgKCFhZGV2LT5nZnguaW5fcmVzZXQpIHsKIAkJbWVtc2V0KCh2b2lkICop bXFkLCAwLCBzaXplb2YoKm1xZCkpOwpAQCAtMjI2MCw5ICsyMjU5LDcgQEAgc3RhdGljIGludCBn ZnhfdjlfMF9rY3FfaW5pdF9xdWV1ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJCWFtZGdw dV9yaW5nX2NsZWFyX3JpbmcocmluZyk7CiAJfQogCi0JciA9IGdmeF92OV8wX21hcF9xdWV1ZV9l bmFibGUoJmtpcS0+cmluZywgcmluZyk7Ci0KLQlyZXR1cm4gcjsKKwlyZXR1cm4gMDsKIH0KIAog c3RhdGljIGludCBnZnhfdjlfMF9raXFfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 KQpAQCAtMjMwNSwxMyArMjMwMiwxNCBAQCBzdGF0aWMgaW50IGdmeF92OV8wX2tpcV9yZXN1bWUo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCQlnb3RvIGRvbmU7CiAJfQogCisJciA9IGdm eF92OV8wX21hcF9xdWV1ZXNfZW5hYmxlKGFkZXYpOwogZG9uZToKIAlyZXR1cm4gcjsKIH0KIAog c3RhdGljIGludCBnZnhfdjlfMF9jcF9yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp CiB7Ci0JaW50IHIsaTsKKwlpbnQgciwgaTsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmc7CiAK IAlpZiAoIShhZGV2LT5mbGFncyAmIEFNRF9JU19BUFUpKQotLSAKMi41LjUKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0 CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=