From: Felix Kuehling Subject: [PATCH] drm/amdkfd: Make queue mapping interfaces more consistent Date: Tue, 17 Oct 2017 22:55:13 -0400 Message-ID: <1508295313-9552-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: 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: Felix Kuehling UGFzcyB1bm1hcCBmaWx0ZXIgcGFyYW1ldGVycyBkaXJlY3RseSB0byBleGVjdXRlX3F1ZXVlc19j cHNjaCwgc2FtZQphcyB1bm1hcF9xdWV1ZXNfY3BzY2guCgpTaWduZWQtb2ZmLWJ5OiBGZWxpeCBL dWVobGluZyA8RmVsaXguS3VlaGxpbmdAYW1kLmNvbT4KLS0tCiAuLi4vZ3B1L2RybS9hbWQvYW1k a2ZkL2tmZF9kZXZpY2VfcXVldWVfbWFuYWdlci5jICB8IDMyICsrKysrKysrKysrLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfZGV2aWNlX3F1ZXVlX21h bmFnZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVfbWFu YWdlci5jCmluZGV4IDkzM2FkYjUuLmRhM2I3NDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVfbWFuYWdlci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1ka2ZkL2tmZF9kZXZpY2VfcXVldWVfbWFuYWdlci5jCkBAIC00NSw3ICs0NSw4 IEBAIHN0YXRpYyBpbnQgY3JlYXRlX2NvbXB1dGVfcXVldWVfbm9jcHNjaChzdHJ1Y3QgZGV2aWNl X3F1ZXVlX21hbmFnZXIgKmRxbSwKIAkJCQkJc3RydWN0IHFjbV9wcm9jZXNzX2RldmljZSAqcXBk KTsKIAogc3RhdGljIGludCBleGVjdXRlX3F1ZXVlc19jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVl X21hbmFnZXIgKmRxbSwKLQkJCQlib29sIHN0YXRpY19xdWV1ZXNfaW5jbHVkZWQpOworCQkJCWVu dW0ga2ZkX3VubWFwX3F1ZXVlc19maWx0ZXIgZmlsdGVyLAorCQkJCXVpbnQzMl90IGZpbHRlcl9w YXJhbSk7CiBzdGF0aWMgaW50IHVubWFwX3F1ZXVlc19jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVl X21hbmFnZXIgKmRxbSwKIAkJCQllbnVtIGtmZF91bm1hcF9xdWV1ZXNfZmlsdGVyIGZpbHRlciwK IAkJCQl1aW50MzJfdCBmaWx0ZXJfcGFyYW0pOwpAQCAtNzQxLDcgKzc0Miw3IEBAIHN0YXRpYyBp bnQgc3RhcnRfY3BzY2goc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0pCiAJaW5pdF9p bnRlcnJ1cHRzKGRxbSk7CiAKIAltdXRleF9sb2NrKCZkcW0tPmxvY2spOwotCWV4ZWN1dGVfcXVl dWVzX2Nwc2NoKGRxbSwgZmFsc2UpOworCWV4ZWN1dGVfcXVldWVzX2Nwc2NoKGRxbSwgS0ZEX1VO TUFQX1FVRVVFU19GSUxURVJfRFlOQU1JQ19RVUVVRVMsIDApOwogCW11dGV4X3VubG9jaygmZHFt LT5sb2NrKTsKIAogCXJldHVybiAwOwpAQCAtNzg3LDcgKzc4OCw3IEBAIHN0YXRpYyBpbnQgY3Jl YXRlX2tlcm5lbF9xdWV1ZV9jcHNjaChzdHJ1Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwK IAlsaXN0X2FkZCgma3EtPmxpc3QsICZxcGQtPnByaXZfcXVldWVfbGlzdCk7CiAJZHFtLT5xdWV1 ZV9jb3VudCsrOwogCXFwZC0+aXNfZGVidWcgPSB0cnVlOwotCWV4ZWN1dGVfcXVldWVzX2Nwc2No KGRxbSwgZmFsc2UpOworCWV4ZWN1dGVfcXVldWVzX2Nwc2NoKGRxbSwgS0ZEX1VOTUFQX1FVRVVF U19GSUxURVJfRFlOQU1JQ19RVUVVRVMsIDApOwogCW11dGV4X3VubG9jaygmZHFtLT5sb2NrKTsK IAogCXJldHVybiAwOwpAQCAtODAxLDcgKzgwMiw3IEBAIHN0YXRpYyB2b2lkIGRlc3Ryb3lfa2Vy bmVsX3F1ZXVlX2Nwc2NoKHN0cnVjdCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLAogCWxpc3Rf ZGVsKCZrcS0+bGlzdCk7CiAJZHFtLT5xdWV1ZV9jb3VudC0tOwogCXFwZC0+aXNfZGVidWcgPSBm YWxzZTsKLQlleGVjdXRlX3F1ZXVlc19jcHNjaChkcW0sIHRydWUpOworCWV4ZWN1dGVfcXVldWVz X2Nwc2NoKGRxbSwgS0ZEX1VOTUFQX1FVRVVFU19GSUxURVJfQUxMX1FVRVVFUywgMCk7CiAJLyoK IAkgKiBVbmNvbmRpdGlvbmFsbHkgZGVjcmVtZW50IHRoaXMgY291bnRlciwgcmVnYXJkbGVzcyBv ZiB0aGUgcXVldWUncwogCSAqIHR5cGUuCkBAIC04NTksNyArODYwLDggQEAgc3RhdGljIGludCBj cmVhdGVfcXVldWVfY3BzY2goc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0sIHN0cnVj dCBxdWV1ZSAqcSwKIAlxcGQtPnF1ZXVlX2NvdW50Kys7CiAJaWYgKHEtPnByb3BlcnRpZXMuaXNf YWN0aXZlKSB7CiAJCWRxbS0+cXVldWVfY291bnQrKzsKLQkJcmV0dmFsID0gZXhlY3V0ZV9xdWV1 ZXNfY3BzY2goZHFtLCBmYWxzZSk7CisJCXJldHZhbCA9IGV4ZWN1dGVfcXVldWVzX2Nwc2NoKGRx bSwKKwkJCQlLRkRfVU5NQVBfUVVFVUVTX0ZJTFRFUl9EWU5BTUlDX1FVRVVFUywgMCk7CiAJfQog CiAJaWYgKHEtPnByb3BlcnRpZXMudHlwZSA9PSBLRkRfUVVFVUVfVFlQRV9TRE1BKQpAQCAtOTY0 LDE2ICs5NjYsMTIgQEAgc3RhdGljIGludCB1bm1hcF9xdWV1ZXNfY3BzY2goc3RydWN0IGRldmlj ZV9xdWV1ZV9tYW5hZ2VyICpkcW0sCiAKIC8qIGRxbS0+bG9jayBtdXRleCBoYXMgdG8gYmUgbG9j a2VkIGJlZm9yZSBjYWxsaW5nIHRoaXMgZnVuY3Rpb24gKi8KIHN0YXRpYyBpbnQgZXhlY3V0ZV9x dWV1ZXNfY3BzY2goc3RydWN0IGRldmljZV9xdWV1ZV9tYW5hZ2VyICpkcW0sCi0JCQkJYm9vbCBz dGF0aWNfcXVldWVzX2luY2x1ZGVkKQorCQkJCWVudW0ga2ZkX3VubWFwX3F1ZXVlc19maWx0ZXIg ZmlsdGVyLAorCQkJCXVpbnQzMl90IGZpbHRlcl9wYXJhbSkKIHsKIAlpbnQgcmV0dmFsOwotCWVu dW0ga2ZkX3VubWFwX3F1ZXVlc19maWx0ZXIgZmlsdGVyOwotCi0JZmlsdGVyID0gc3RhdGljX3F1 ZXVlc19pbmNsdWRlZCA/Ci0JCQlLRkRfVU5NQVBfUVVFVUVTX0ZJTFRFUl9BTExfUVVFVUVTIDoK LQkJCUtGRF9VTk1BUF9RVUVVRVNfRklMVEVSX0RZTkFNSUNfUVVFVUVTOwogCi0JcmV0dmFsID0g dW5tYXBfcXVldWVzX2Nwc2NoKGRxbSwgZmlsdGVyLCAwKTsKKwlyZXR2YWwgPSB1bm1hcF9xdWV1 ZXNfY3BzY2goZHFtLCBmaWx0ZXIsIGZpbHRlcl9wYXJhbSk7CiAJaWYgKHJldHZhbCkgewogCQlw cl9lcnIoIlRoZSBjcCBtaWdodCBiZSBpbiBhbiB1bnJlY292ZXJhYmxlIHN0YXRlIGR1ZSB0byBh biB1bnN1Y2Nlc3NmdWwgcXVldWVzIHByZWVtcHRpb25cbiIpOwogCQlyZXR1cm4gcmV0dmFsOwpA QCAtMTAyNCw3ICsxMDIyLDggQEAgc3RhdGljIGludCBkZXN0cm95X3F1ZXVlX2Nwc2NoKHN0cnVj dCBkZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLAogCWlmIChxLT5wcm9wZXJ0aWVzLmlzX2FjdGl2 ZSkKIAkJZHFtLT5xdWV1ZV9jb3VudC0tOwogCi0JcmV0dmFsID0gZXhlY3V0ZV9xdWV1ZXNfY3Bz Y2goZHFtLCBmYWxzZSk7CisJcmV0dmFsID0gZXhlY3V0ZV9xdWV1ZXNfY3BzY2goZHFtLAorCQkJ CUtGRF9VTk1BUF9RVUVVRVNfRklMVEVSX0RZTkFNSUNfUVVFVUVTLCAwKTsKIAlpZiAocmV0dmFs ID09IC1FVElNRSkKIAkJcXBkLT5yZXNldF93YXZlZnJvbnRzID0gdHJ1ZTsKIApAQCAtMTE1Nyw3 ICsxMTU2LDggQEAgc3RhdGljIGludCBwcm9jZXNzX3Rlcm1pbmF0aW9uX2Nwc2NoKHN0cnVjdCBk ZXZpY2VfcXVldWVfbWFuYWdlciAqZHFtLAogCXN0cnVjdCBrZXJuZWxfcXVldWUgKmtxLCAqa3Ff bmV4dDsKIAlzdHJ1Y3QgbXFkX21hbmFnZXIgKm1xZDsKIAlzdHJ1Y3QgZGV2aWNlX3Byb2Nlc3Nf bm9kZSAqY3VyLCAqbmV4dF9kcG47Ci0JYm9vbCB1bm1hcF9zdGF0aWNfcXVldWVzID0gZmFsc2U7 CisJZW51bSBrZmRfdW5tYXBfcXVldWVzX2ZpbHRlciBmaWx0ZXIgPQorCQlLRkRfVU5NQVBfUVVF VUVTX0ZJTFRFUl9EWU5BTUlDX1FVRVVFUzsKIAogCXJldHZhbCA9IDA7CiAKQEAgLTExNjksNyAr MTE2OSw3IEBAIHN0YXRpYyBpbnQgcHJvY2Vzc190ZXJtaW5hdGlvbl9jcHNjaChzdHJ1Y3QgZGV2 aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwKIAkJZHFtLT5xdWV1ZV9jb3VudC0tOwogCQlxcGQtPmlz X2RlYnVnID0gZmFsc2U7CiAJCWRxbS0+dG90YWxfcXVldWVfY291bnQtLTsKLQkJdW5tYXBfc3Rh dGljX3F1ZXVlcyA9IHRydWU7CisJCWZpbHRlciA9IEtGRF9VTk1BUF9RVUVVRVNfRklMVEVSX0FM TF9RVUVVRVM7CiAJfQogCiAJLyogQ2xlYXIgYWxsIHVzZXIgbW9kZSBxdWV1ZXMgKi8KQEAgLTEx OTMsNyArMTE5Myw3IEBAIHN0YXRpYyBpbnQgcHJvY2Vzc190ZXJtaW5hdGlvbl9jcHNjaChzdHJ1 Y3QgZGV2aWNlX3F1ZXVlX21hbmFnZXIgKmRxbSwKIAkJfQogCX0KIAotCXJldHZhbCA9IGV4ZWN1 dGVfcXVldWVzX2Nwc2NoKGRxbSwgdW5tYXBfc3RhdGljX3F1ZXVlcyk7CisJcmV0dmFsID0gZXhl Y3V0ZV9xdWV1ZXNfY3BzY2goZHFtLCBmaWx0ZXIsIDApOwogCWlmIChyZXR2YWwgfHwgcXBkLT5y ZXNldF93YXZlZnJvbnRzKSB7CiAJCXByX3dhcm4oIlJlc2V0dGluZyB3YXZlIGZyb250cyAoY3Bz Y2gpIG9uIGRldiAlcFxuIiwgZHFtLT5kZXYpOwogCQlkYmdkZXZfd2F2ZV9yZXNldF93YXZlZnJv bnRzKGRxbS0+ZGV2LCBxcGQtPnBxbS0+cHJvY2Vzcyk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QK YW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==