From: Andres Rodriguez Subject: [PATCH 15/17] drm/amdgpu: remove hardcoded queue_mask in PACKET3_SET_RESOURCES Date: Thu, 13 Apr 2017 17:35:40 -0400 Message-ID: <20170413213542.18802-16-andresx7@gmail.com> References: <20170413213542.18802-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170413213542.18802-1-andresx7-Re5JQEeQqe8AvxtiuMwx3w@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: andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org VGhlIGFzc3VtcHRpb24gdGhhdCB3ZSBhcmUgb25seSB1c2luZyB0aGUgZmlyc3QgcGlwZSBubyBs b25nZXIgaG9sZHMuCkluc3RlYWQsIGNhbGN1bGF0ZSB0aGUgcXVldWVfbWFzayBmcm9tIHRoZSBx dWV1ZV9iaXRtYXAuCgpBY2tlZC1ieTogRmVsaXggS3VlaGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFt ZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFuZHJlcyBSb2RyaWd1ZXogPGFuZHJlc3g3QGdtYWlsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jIHwgMjAgKysrKysr KysrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgfCAy MyArKysrKysrKysrKysrKysrKysrKystLQogMiBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25z KCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dmeF92OF8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCmlu ZGV4IDkwZTFkZDMuLmZmNzczNTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dmeF92OF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAu YwpAQCAtNDY5Nyw2MCArNDY5Nyw3NiBAQCBzdGF0aWMgaW50IGdmeF92OF8wX2NwX2NvbXB1dGVf bG9hZF9taWNyb2NvZGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAKIC8qIEtJUSBmdW5j dGlvbnMgKi8KIHN0YXRpYyB2b2lkIGdmeF92OF8wX2tpcV9zZXR0aW5nKHN0cnVjdCBhbWRncHVf cmluZyAqcmluZykKIHsKIAl1aW50MzJfdCB0bXA7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYgPSByaW5nLT5hZGV2OwogCiAJLyogdGVsbCBSTEMgd2hpY2ggaXMgS0lRIHF1ZXVlICovCiAJ dG1wID0gUlJFRzMyKG1tUkxDX0NQX1NDSEVEVUxFUlMpOwogCXRtcCAmPSAweGZmZmZmZjAwOwog CXRtcCB8PSAocmluZy0+bWUgPDwgNSkgfCAocmluZy0+cGlwZSA8PCAzKSB8IChyaW5nLT5xdWV1 ZSk7CiAJV1JFRzMyKG1tUkxDX0NQX1NDSEVEVUxFUlMsIHRtcCk7CiAJdG1wIHw9IDB4ODA7CiAJ V1JFRzMyKG1tUkxDX0NQX1NDSEVEVUxFUlMsIHRtcCk7CiB9CiAKIHN0YXRpYyBpbnQgZ2Z4X3Y4 XzBfa2lxX2tjcV9lbmFibGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJc3RydWN0 IGFtZGdwdV9yaW5nICpraXFfcmluZyA9ICZhZGV2LT5nZngua2lxLnJpbmc7CiAJdWludDMyX3Qg c2NyYXRjaCwgdG1wID0gMDsKKwl1aW50NjRfdCBxdWV1ZV9tYXNrID0gMDsKIAlpbnQgciwgaTsK IAorCWZvciAoaSA9IDA7IGkgPCBBTURHUFVfTUFYX0NPTVBVVEVfUVVFVUVTOyArK2kpIHsKKwkJ aWYgKCF0ZXN0X2JpdChpLCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCkpCisJCQljb250aW51 ZTsKKworCQkvKiBUaGlzIHNpdHVhdGlvbiBtYXkgYmUgaGl0IGluIHRoZSBmdXR1cmUgaWYgYSBu ZXcgSFcKKwkJICogZ2VuZXJhdGlvbiBleHBvc2VzIG1vcmUgdGhhbiA2NCBxdWV1ZXMuIElmIHNv LCB0aGUKKwkJICogZGVmaW5pdGlvbiBvZiBxdWV1ZV9tYXNrIG5lZWRzIHVwZGF0aW5nICovCisJ CWlmIChXQVJOX09OKGkgPiAoc2l6ZW9mKHF1ZXVlX21hc2spKjgpKSkgeworCQkJRFJNX0VSUk9S KCJJbnZhbGlkIEtDUSBlbmFibGVkOiAlZFxuIiwgaSk7CisJCQlicmVhazsKKwkJfQorCisJCXF1 ZXVlX21hc2sgfD0gKDF1bGwgPDwgaSk7CisJfQorCiAJciA9IGFtZGdwdV9nZnhfc2NyYXRjaF9n ZXQoYWRldiwgJnNjcmF0Y2gpOwogCWlmIChyKSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGdl dCBzY3JhdGNoIHJlZyAoJWQpLlxuIiwgcik7CiAJCXJldHVybiByOwogCX0KIAlXUkVHMzIoc2Ny YXRjaCwgMHhDQUZFREVBRCk7CiAKIAlyID0gYW1kZ3B1X3JpbmdfYWxsb2Moa2lxX3JpbmcsICg4 ICogYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzKSArIDExKTsKIAlpZiAocikgewogCQlEUk1f RVJST1IoIkZhaWxlZCB0byBsb2NrIEtJUSAoJWQpLlxuIiwgcik7CiAJCWFtZGdwdV9nZnhfc2Ny YXRjaF9mcmVlKGFkZXYsIHNjcmF0Y2gpOwogCQlyZXR1cm4gcjsKIAl9CiAJLyogc2V0IHJlc291 cmNlcyAqLwogCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCBQQUNLRVQzKFBBQ0tFVDNfU0VU X1JFU09VUkNFUywgNikpOwogCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsJLyogdm1p ZF9tYXNrOjAgcXVldWVfdHlwZTowIChLSVEpICovCi0JYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3Jp bmcsIDB4MDAwMDAwRkYpOwkvKiBxdWV1ZSBtYXNrIGxvICovCi0JYW1kZ3B1X3Jpbmdfd3JpdGUo a2lxX3JpbmcsIDApOwkvKiBxdWV1ZSBtYXNrIGhpICovCisJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lx X3JpbmcsIGxvd2VyXzMyX2JpdHMocXVldWVfbWFzaykpOwkvKiBxdWV1ZSBtYXNrIGxvICovCisJ YW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIHVwcGVyXzMyX2JpdHMocXVldWVfbWFzaykpOwkv KiBxdWV1ZSBtYXNrIGhpICovCiAJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIDApOwkvKiBn d3MgbWFzayBsbyAqLwogCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsJLyogZ3dzIG1h c2sgaGkgKi8KIAlhbWRncHVfcmluZ193cml0ZShraXFfcmluZywgMCk7CS8qIG9hYyBtYXNrICov CiAJYW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsIDApOwkvKiBnZHMgaGVhcCBiYXNlOjAsIGdk cyBoZWFwIHNpemU6MCAqLwogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5nZngubnVtX2NvbXB1dGVf cmluZ3M7IGkrKykgewogCQlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcgPSAmYWRldi0+Z2Z4LmNv bXB1dGVfcmluZ1tpXTsKIAkJdWludDY0X3QgbXFkX2FkZHIgPSBhbWRncHVfYm9fZ3B1X29mZnNl dChyaW5nLT5tcWRfb2JqKTsKIAkJdWludDY0X3Qgd3B0cl9hZGRyID0gYWRldi0+d2IuZ3B1X2Fk ZHIgKyAocmluZy0+d3B0cl9vZmZzICogNCk7CiAKIAkJLyogbWFwIHF1ZXVlcyAqLwogCQlhbWRn cHVfcmluZ193cml0ZShraXFfcmluZywgUEFDS0VUMyhQQUNLRVQzX01BUF9RVUVVRVMsIDUpKTsK IAkJLyogUV9zZWw6MCwgdm1pZDowLCB2aWRtZW06IDEsIGVuZ2luZTowLCBudW1fUToxKi8KIAkJ YW1kZ3B1X3Jpbmdfd3JpdGUoa2lxX3JpbmcsCiAJCQkJICBQQUNLRVQzX01BUF9RVUVVRVNfTlVN X1FVRVVFUygxKSk7CiAJCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLAogCQkJCSAgUEFDS0VU M19NQVBfUVVFVUVTX0RPT1JCRUxMX09GRlNFVChyaW5nLT5kb29yYmVsbF9pbmRleCkgfAogCQkJ CSAgUEFDS0VUM19NQVBfUVVFVUVTX1FVRVVFKHJpbmctPnF1ZXVlKSB8CiAJCQkJICBQQUNLRVQz X01BUF9RVUVVRVNfUElQRShyaW5nLT5waXBlKSB8CiAJCQkJICBQQUNLRVQzX01BUF9RVUVVRVNf TUUocmluZy0+bWUgPT0gMSA/IDAgOiAxKSk7IC8qIGRvb3JiZWxsICovCiAJCWFtZGdwdV9yaW5n X3dyaXRlKGtpcV9yaW5nLCBsb3dlcl8zMl9iaXRzKG1xZF9hZGRyKSk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvZ2Z4X3Y5XzAuYwppbmRleCA2MjA4NDkzLi41YTVmZjQ3IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKQEAgLTE4OTUsNDYgKzE4OTUsNjUgQEAgc3RhdGljIGlu dCBnZnhfdjlfMF9jcF9jb21wdXRlX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAlyZXR1cm4gMDsKIH0KIAogLyogS0lRIGZ1bmN0aW9ucyAqLwogc3RhdGljIHZvaWQgZ2Z4X3Y5 XzBfa2lxX3NldHRpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXVpbnQzMl90IHRt cDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFkZXY7CiAKIAkvKiB0ZWxs IFJMQyB3aGljaCBpcyBLSVEgcXVldWUgKi8KIAl0bXAgPSBSUkVHMzJfU09DMTUoR0MsIDAsIG1t UkxDX0NQX1NDSEVEVUxFUlMpOwogCXRtcCAmPSAweGZmZmZmZjAwOwogCXRtcCB8PSAocmluZy0+ bWUgPDwgNSkgfCAocmluZy0+cGlwZSA8PCAzKSB8IChyaW5nLT5xdWV1ZSk7CiAJV1JFRzMyX1NP QzE1KEdDLCAwLCBtbVJMQ19DUF9TQ0hFRFVMRVJTLCB0bXApOwogCXRtcCB8PSAweDgwOwogCVdS RUczMl9TT0MxNShHQywgMCwgbW1STENfQ1BfU0NIRURVTEVSUywgdG1wKTsKIH0KIAogc3RhdGlj IHZvaWQgZ2Z4X3Y5XzBfa2lxX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiB7CisJ aW50IGk7CisJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5nLT5hZGV2OworCXVpbnQ2 NF90IHF1ZXVlX21hc2sgPSAwOworCisJZm9yIChpID0gMDsgaSA8IEFNREdQVV9NQVhfQ09NUFVU RV9RVUVVRVM7ICsraSkgeworCQlpZiAoIXRlc3RfYml0KGksIGFkZXYtPmdmeC5tZWMucXVldWVf Yml0bWFwKSkKKwkJCWNvbnRpbnVlOworCisJCS8qIFRoaXMgc2l0dWF0aW9uIG1heSBiZSBoaXQg aW4gdGhlIGZ1dHVyZSBpZiBhIG5ldyBIVworCQkgKiBnZW5lcmF0aW9uIGV4cG9zZXMgbW9yZSB0 aGFuIDY0IHF1ZXVlcy4gSWYgc28sIHRoZQorCQkgKiBkZWZpbml0aW9uIG9mIHF1ZXVlX21hc2sg bmVlZHMgdXBkYXRpbmcgKi8KKwkJaWYgKFdBUk5fT04oaSA+IChzaXplb2YocXVldWVfbWFzaykq OCkpKSB7CisJCQlEUk1fRVJST1IoIkludmFsaWQgS0NRIGVuYWJsZWQ6ICVkXG4iLCBpKTsKKwkJ CWJyZWFrOworCQl9CisKKwkJcXVldWVfbWFzayB8PSAoMXVsbCA8PCBpKTsKKwl9CisKIAlhbWRn cHVfcmluZ19hbGxvYyhyaW5nLCA4KTsKIAkvKiBzZXQgcmVzb3VyY2VzICovCiAJYW1kZ3B1X3Jp bmdfd3JpdGUocmluZywgUEFDS0VUMyhQQUNLRVQzX1NFVF9SRVNPVVJDRVMsIDYpKTsKIAlhbWRn cHVfcmluZ193cml0ZShyaW5nLCAwKTsJLyogdm1pZF9tYXNrOjAgcXVldWVfdHlwZTowIChLSVEp ICovCi0JYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMHgwMDAwMDBGRik7CS8qIHF1ZXVlIG1hc2sg bG8gKi8KLQlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsJLyogcXVldWUgbWFzayBoaSAqLwor CWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIGxvd2VyXzMyX2JpdHMocXVldWVfbWFzaykpOwkvKiBx dWV1ZSBtYXNrIGxvICovCisJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgdXBwZXJfMzJfYml0cyhx dWV1ZV9tYXNrKSk7CS8qIHF1ZXVlIG1hc2sgaGkgKi8KIAlhbWRncHVfcmluZ193cml0ZShyaW5n LCAwKTsJLyogZ3dzIG1hc2sgbG8gKi8KIAlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsJLyog Z3dzIG1hc2sgaGkgKi8KIAlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsJLyogb2FjIG1hc2sg Ki8KIAlhbWRncHVfcmluZ193cml0ZShyaW5nLCAwKTsJLyogZ2RzIGhlYXAgYmFzZTowLCBnZHMg aGVhcCBzaXplOjAgKi8KIAlhbWRncHVfcmluZ19jb21taXQocmluZyk7CiAJdWRlbGF5KDUwKTsK IH0KIAogc3RhdGljIHZvaWQgZ2Z4X3Y5XzBfbWFwX3F1ZXVlX2VuYWJsZShzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKmtpcV9yaW5nLAogCQkJCSAgIHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIHsKIAlz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGtpcV9yaW5nLT5hZGV2OwogCXVpbnQ2NF90IG1x ZF9hZGRyLCB3cHRyX2FkZHI7CiAKIAltcWRfYWRkciA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0KHJp bmctPm1xZF9vYmopOwogCXdwdHJfYWRkciA9IGFkZXYtPndiLmdwdV9hZGRyICsgKHJpbmctPndw dHJfb2ZmcyAqIDQpOwogCWFtZGdwdV9yaW5nX2FsbG9jKGtpcV9yaW5nLCA4KTsKIAogCWFtZGdw dV9yaW5nX3dyaXRlKGtpcV9yaW5nLCBQQUNLRVQzKFBBQ0tFVDNfTUFQX1FVRVVFUywgNSkpOwog CS8qIFFfc2VsOjAsIHZtaWQ6MCwgdmlkbWVtOiAxLCBlbmdpbmU6MCwgbnVtX1E6MSovCi0tIAoy LjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1k LWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==