From: Felix Kuehling Subject: [PATCH 2/9] drm/amdkfd: Simplify execute and unmap queue APIs Date: Wed, 27 Sep 2017 00:09:49 -0400 Message-ID: <1506485396-6326-3-git-send-email-Felix.Kuehling@amd.com> References: <1506485396-6326-1-git-send-email-Felix.Kuehling@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1506485396-6326-1-git-send-email-Felix.Kuehling-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, oded.gabbay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: Yong Zhao , Felix Kuehling RnJvbTogWW9uZyBaaGFvIDx5b25nLnpoYW9AYW1kLmNvbT4KClBhc3MgZmlsdGVyIHBhcmFtZXRl cnMgZGlyZWN0bHkgdG8gdW5tYXBfcXVldWVzX2Nwc2NoLgoKQWxzbyByZW1vdmUgbG9jayBwYXJh bWV0ZXJzIGFuZCBkbyBsb2NraW5nIGV4cGxpY2l0bHkgaW4gdGhlIGNhbGxlci4KClNpZ25lZC1v ZmYtYnk6IFlvbmcgWmhhbyA8eW9uZy56aGFvQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEZlbGl4 IEt1ZWhsaW5nIDxGZWxpeC5LdWVobGluZ0BhbWQuY29tPgotLS0KIC4uLi9ncHUvZHJtL2FtZC9h bWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmMgIHwgNzUgKysrKysrKysrLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDQzIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVf bWFuYWdlci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9t YW5hZ2VyLmMKaW5kZXggMTk5NWUwYS4uYmU5MjVhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRrZmQva2ZkX2RldmljZV9xdWV1ZV9tYW5hZ2VyLmMKQEAgLTQ0LDkgKzQ0 LDEwIEBAIHN0YXRpYyBpbnQgY3JlYXRlX2NvbXB1dGVfcXVldWVfbm9jcHNjaChzdHJ1Y3QgZGV2 aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwKIAkJCQkJc3RydWN0IHF1ZXVlICpxLAogCQkJCQlzdHJ1 Y3QgcWNtX3Byb2Nlc3NfZGV2aWNlICpxcGQpOwogCi1zdGF0aWMgaW50IGV4ZWN1dGVfcXVldWVz X2Nwc2NoKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLCBib29sIGxvY2spOworc3Rh dGljIGludCBleGVjdXRlX3F1ZXVlc19jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIg KmRxbSk7CiBzdGF0aWMgaW50IHVubWFwX3F1ZXVlc19jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVl X21hbmFnZXIgKmRxbSwKLQkJCQlib29sIHN0YXRpY19xdWV1ZXNfaW5jbHVkZWQsIGJvb2wgbG9j ayk7CisJCQkJZW51bSBrZmRfdW5tYXBfcXVldWVzX2ZpbHRlciBmaWx0ZXIsCisJCQkJdWludDMy X3QgZmlsdGVyX3BhcmFtKTsKIAogc3RhdGljIGludCBjcmVhdGVfc2RtYV9xdWV1ZV9ub2Nwc2No KHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLAogCQkJCQlzdHJ1Y3QgcXVldWUgKnEs CkBAIC0zNzksNyArMzgwLDcgQEAgc3RhdGljIGludCB1cGRhdGVfcXVldWUoc3RydWN0IGRldmlj ZV9xdWV1ZV9tYW5hZ2VyICpkcW0sIHN0cnVjdCBxdWV1ZSAqcSkKIAkJZHFtLT5xdWV1ZV9jb3Vu dC0tOwogCiAJaWYgKHNjaGVkX3BvbGljeSAhPSBLRkRfU0NIRURfUE9MSUNZX05PX0hXUykKLQkJ cmV0dmFsID0gZXhlY3V0ZV9xdWV1ZXNfY3BzY2goZHFtLCBmYWxzZSk7CisJCXJldHZhbCA9IGV4 ZWN1dGVfcXVldWVzX2Nwc2NoKGRxbSk7CiAKIG91dF91bmxvY2s6CiAJbXV0ZXhfdW5sb2NrKCZk cW0tPmxvY2spOwpAQCAtNjk1LDcgKzY5Niw5IEBAIHN0YXRpYyBpbnQgc3RhcnRfY3BzY2goc3Ry dWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pCiAKIAlpbml0X2ludGVycnVwdHMoZHFtKTsK IAotCWV4ZWN1dGVfcXVldWVzX2Nwc2NoKGRxbSwgdHJ1ZSk7CisJbXV0ZXhfbG9jaygmZHFtLT5s b2NrKTsKKwlleGVjdXRlX3F1ZXVlc19jcHNjaChkcW0pOworCW11dGV4X3VubG9jaygmZHFtLT5s b2NrKTsKIAogCXJldHVybiAwOwogZmFpbF9hbGxvY2F0ZV92aWRtZW06CkBAIC03MDcsNyArNzEw LDkgQEAgc3RhdGljIGludCBzdGFydF9jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIg KmRxbSkKIAogc3RhdGljIGludCBzdG9wX2Nwc2NoKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdl ciAqZHFtKQogewotCXVubWFwX3F1ZXVlc19jcHNjaChkcW0sIHRydWUsIHRydWUpOworCW11dGV4 X2xvY2soJmRxbS0+bG9jayk7CisJdW5tYXBfcXVldWVzX2Nwc2NoKGRxbSwgS0ZEX1VOTUFQX1FV RVVFU19GSUxURVJfQUxMX1FVRVVFUywgMCk7CisJbXV0ZXhfdW5sb2NrKCZkcW0tPmxvY2spOwog CiAJa2ZkX2d0dF9zYV9mcmVlKGRxbS0+ZGV2LCBkcW0tPmZlbmNlX21lbSk7CiAJcG1fdW5pbml0 KCZkcW0tPnBhY2tldHMpOwpAQCAtNzM4LDcgKzc0Myw3IEBAIHN0YXRpYyBpbnQgY3JlYXRlX2tl cm5lbF9xdWV1ZV9jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwKIAlsaXN0 X2FkZCgma3EtPmxpc3QsICZxcGQtPnByaXZfcXVldWVfbGlzdCk7CiAJZHFtLT5xdWV1ZV9jb3Vu dCsrOwogCXFwZC0+aXNfZGVidWcgPSB0cnVlOwotCWV4ZWN1dGVfcXVldWVzX2Nwc2NoKGRxbSwg ZmFsc2UpOworCWV4ZWN1dGVfcXVldWVzX2Nwc2NoKGRxbSk7CiAJbXV0ZXhfdW5sb2NrKCZkcW0t PmxvY2spOwogCiAJcmV0dXJuIDA7CkBAIC03NTAsMTEgKzc1NSwxMSBAQCBzdGF0aWMgdm9pZCBk ZXN0cm95X2tlcm5lbF9xdWV1ZV9jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRx bSwKIHsKIAltdXRleF9sb2NrKCZkcW0tPmxvY2spOwogCS8qIGhlcmUgd2UgYWN0dWFsbHkgcHJl ZW1wdCB0aGUgRElRICovCi0JdW5tYXBfcXVldWVzX2Nwc2NoKGRxbSwgdHJ1ZSwgZmFsc2UpOwor CXVubWFwX3F1ZXVlc19jcHNjaChkcW0sIEtGRF9VTk1BUF9RVUVVRVNfRklMVEVSX0FMTF9RVUVV RVMsIDApOwogCWxpc3RfZGVsKCZrcS0+bGlzdCk7CiAJZHFtLT5xdWV1ZV9jb3VudC0tOwogCXFw ZC0+aXNfZGVidWcgPSBmYWxzZTsKLQlleGVjdXRlX3F1ZXVlc19jcHNjaChkcW0sIGZhbHNlKTsK KwlleGVjdXRlX3F1ZXVlc19jcHNjaChkcW0pOwogCS8qCiAJICogVW5jb25kaXRpb25hbGx5IGRl Y3JlbWVudCB0aGlzIGNvdW50ZXIsIHJlZ2FyZGxlc3Mgb2YgdGhlIHF1ZXVlJ3MKIAkgKiB0eXBl LgpAQCAtODEzLDcgKzgxOCw3IEBAIHN0YXRpYyBpbnQgY3JlYXRlX3F1ZXVlX2Nwc2NoKHN0cnVj dCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLCBzdHJ1Y3QgcXVldWUgKnEsCiAJbGlzdF9hZGQo JnEtPmxpc3QsICZxcGQtPnF1ZXVlc19saXN0KTsKIAlpZiAocS0+cHJvcGVydGllcy5pc19hY3Rp dmUpIHsKIAkJZHFtLT5xdWV1ZV9jb3VudCsrOwotCQlyZXR2YWwgPSBleGVjdXRlX3F1ZXVlc19j cHNjaChkcW0sIGZhbHNlKTsKKwkJcmV0dmFsID0gZXhlY3V0ZV9xdWV1ZXNfY3BzY2goZHFtKTsK IAl9CiAKIAlpZiAocS0+cHJvcGVydGllcy50eXBlID09IEtGRF9RVUVVRV9UWVBFX1NETUEpCkBA IC04NTcsMTkgKzg2MiwxOCBAQCBzdGF0aWMgaW50IHVubWFwX3NkbWFfcXVldWVzKHN0cnVjdCBk ZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLAogCQkJc2RtYV9lbmdpbmUpOwogfQogCisvKiBkcW0t PmxvY2sgbXV0ZXggaGFzIHRvIGJlIGxvY2tlZCBiZWZvcmUgY2FsbGluZyB0aGlzIGZ1bmN0aW9u ICovCiBzdGF0aWMgaW50IHVubWFwX3F1ZXVlc19jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21h bmFnZXIgKmRxbSwKLQkJCQlib29sIHN0YXRpY19xdWV1ZXNfaW5jbHVkZWQsIGJvb2wgbG9jaykK KwkJCQllbnVtIGtmZF91bm1hcF9xdWV1ZXNfZmlsdGVyIGZpbHRlciwKKwkJCQl1aW50MzJfdCBm aWx0ZXJfcGFyYW0pCiB7CiAJaW50IHJldHZhbDsKLQllbnVtIGtmZF91bm1hcF9xdWV1ZXNfZmls dGVyIGZpbHRlcjsKIAlzdHJ1Y3Qga2ZkX3Byb2Nlc3NfZGV2aWNlICpwZGQ7CiAKIAlyZXR2YWwg PSAwOwogCi0JaWYgKGxvY2spCi0JCW11dGV4X2xvY2soJmRxbS0+bG9jayk7CiAJaWYgKCFkcW0t PmFjdGl2ZV9ydW5saXN0KQotCQlnb3RvIG91dDsKKwkJcmV0dXJuIHJldHZhbDsKIAogCXByX2Rl YnVnKCJCZWZvcmUgZGVzdHJveWluZyBxdWV1ZXMsIHNkbWEgcXVldWUgY291bnQgaXMgOiAldVxu IiwKIAkJZHFtLT5zZG1hX3F1ZXVlX2NvdW50KTsKQEAgLTg3OSwxNCArODgzLDEwIEBAIHN0YXRp YyBpbnQgdW5tYXBfcXVldWVzX2Nwc2NoKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFt LAogCQl1bm1hcF9zZG1hX3F1ZXVlcyhkcW0sIDEpOwogCX0KIAotCWZpbHRlciA9IHN0YXRpY19x dWV1ZXNfaW5jbHVkZWQgPwotCQkJS0ZEX1VOTUFQX1FVRVVFU19GSUxURVJfQUxMX1FVRVVFUyA6 Ci0JCQlLRkRfVU5NQVBfUVVFVUVTX0ZJTFRFUl9EWU5BTUlDX1FVRVVFUzsKLQogCXJldHZhbCA9 IHBtX3NlbmRfdW5tYXBfcXVldWUoJmRxbS0+cGFja2V0cywgS0ZEX1FVRVVFX1RZUEVfQ09NUFVU RSwKLQkJCWZpbHRlciwgMCwgZmFsc2UsIDApOworCQkJZmlsdGVyLCBmaWx0ZXJfcGFyYW0sIGZh bHNlLCAwKTsKIAlpZiAocmV0dmFsKQotCQlnb3RvIG91dDsKKwkJcmV0dXJuIHJldHZhbDsKIAog CSpkcW0tPmZlbmNlX2FkZHIgPSBLRkRfRkVOQ0VfSU5JVDsKIAlwbV9zZW5kX3F1ZXJ5X3N0YXR1 cygmZHFtLT5wYWNrZXRzLCBkcW0tPmZlbmNlX2dwdV9hZGRyLApAQCAtODk4LDUwICs4OTgsMzkg QEAgc3RhdGljIGludCB1bm1hcF9xdWV1ZXNfY3BzY2goc3RydWN0IGRldmljZV9xdWV1ZV9tYW5h Z2VyICpkcW0sCiAJCXBkZCA9IGtmZF9nZXRfcHJvY2Vzc19kZXZpY2VfZGF0YShkcW0tPmRldiwK IAkJCQlrZmRfZ2V0X3Byb2Nlc3MoY3VycmVudCkpOwogCQlwZGQtPnJlc2V0X3dhdmVmcm9udHMg PSB0cnVlOwotCQlnb3RvIG91dDsKKwkJcmV0dXJuIHJldHZhbDsKIAl9CiAJcG1fcmVsZWFzZV9p YigmZHFtLT5wYWNrZXRzKTsKIAlkcW0tPmFjdGl2ZV9ydW5saXN0ID0gZmFsc2U7CiAKLW91dDoK LQlpZiAobG9jaykKLQkJbXV0ZXhfdW5sb2NrKCZkcW0tPmxvY2spOwogCXJldHVybiByZXR2YWw7 CiB9CiAKLXN0YXRpYyBpbnQgZXhlY3V0ZV9xdWV1ZXNfY3BzY2goc3RydWN0IGRldmljZV9xdWV1 ZV9tYW5hZ2VyICpkcW0sIGJvb2wgbG9jaykKKy8qIGRxbS0+bG9jayBtdXRleCBoYXMgdG8gYmUg bG9ja2VkIGJlZm9yZSBjYWxsaW5nIHRoaXMgZnVuY3Rpb24gKi8KK3N0YXRpYyBpbnQgZXhlY3V0 ZV9xdWV1ZXNfY3BzY2goc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pCiB7CiAJaW50 IHJldHZhbDsKIAotCWlmIChsb2NrKQotCQltdXRleF9sb2NrKCZkcW0tPmxvY2spOwotCi0JcmV0 dmFsID0gdW5tYXBfcXVldWVzX2Nwc2NoKGRxbSwgZmFsc2UsIGZhbHNlKTsKKwlyZXR2YWwgPSB1 bm1hcF9xdWV1ZXNfY3BzY2goZHFtLCBLRkRfVU5NQVBfUVVFVUVTX0ZJTFRFUl9EWU5BTUlDX1FV RVVFUywKKwkJCTApOwogCWlmIChyZXR2YWwpIHsKIAkJcHJfZXJyKCJUaGUgY3AgbWlnaHQgYmUg aW4gYW4gdW5yZWNvdmVyYWJsZSBzdGF0ZSBkdWUgdG8gYW4gdW5zdWNjZXNzZnVsIHF1ZXVlcyBw cmVlbXB0aW9uIik7Ci0JCWdvdG8gb3V0OworCQlyZXR1cm4gcmV0dmFsOwogCX0KIAotCWlmIChk cW0tPnF1ZXVlX2NvdW50IDw9IDAgfHwgZHFtLT5wcm9jZXNzZXNfY291bnQgPD0gMCkgewotCQly ZXR2YWwgPSAwOwotCQlnb3RvIG91dDsKLQl9CisJaWYgKGRxbS0+cXVldWVfY291bnQgPD0gMCB8 fCBkcW0tPnByb2Nlc3Nlc19jb3VudCA8PSAwKQorCQlyZXR1cm4gMDsKIAotCWlmIChkcW0tPmFj dGl2ZV9ydW5saXN0KSB7Ci0JCXJldHZhbCA9IDA7Ci0JCWdvdG8gb3V0OwotCX0KKwlpZiAoZHFt LT5hY3RpdmVfcnVubGlzdCkKKwkJcmV0dXJuIDA7CiAKIAlyZXR2YWwgPSBwbV9zZW5kX3J1bmxp c3QoJmRxbS0+cGFja2V0cywgJmRxbS0+cXVldWVzKTsKIAlpZiAocmV0dmFsKSB7CiAJCXByX2Vy cigiZmFpbGVkIHRvIGV4ZWN1dGUgcnVubGlzdCIpOwotCQlnb3RvIG91dDsKKwkJcmV0dXJuIHJl dHZhbDsKIAl9CiAJZHFtLT5hY3RpdmVfcnVubGlzdCA9IHRydWU7CiAKLW91dDoKLQlpZiAobG9j aykKLQkJbXV0ZXhfdW5sb2NrKCZkcW0tPmxvY2spOwogCXJldHVybiByZXR2YWw7CiB9CiAKQEAg LTk4NCw3ICs5NzMsNyBAQCBzdGF0aWMgaW50IGRlc3Ryb3lfcXVldWVfY3BzY2goc3RydWN0IGRl dmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0sCiAJaWYgKHEtPnByb3BlcnRpZXMuaXNfYWN0aXZlKQog CQlkcW0tPnF1ZXVlX2NvdW50LS07CiAKLQlleGVjdXRlX3F1ZXVlc19jcHNjaChkcW0sIGZhbHNl KTsKKwlleGVjdXRlX3F1ZXVlc19jcHNjaChkcW0pOwogCiAJbXFkLT51bmluaXRfbXFkKG1xZCwg cS0+bXFkLCBxLT5tcWRfbWVtX29iaik7CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZngK