From: Andres Rodriguez Subject: [PATCH 14/26] drm/amdgpu: remove hardcoded queue_mask in PACKET3_SET_RESOURCES v2 Date: Thu, 6 Apr 2017 02:21:27 -0400 Message-ID: <20170406062139.3335-15-andresx7@gmail.com> References: <20170406062139.3335-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170406062139.3335-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 dWV1ZV9iaXRtYXAuCgp2MjogcmVuYW1lIEFNREdQVV9NQVhfUVVFVUVTIHRvIEFNREdQVV9NQVhf Q09NUFVURV9RVUVVRVMKU2lnbmVkLW9mZi1ieTogQW5kcmVzIFJvZHJpZ3VleiA8YW5kcmVzeDdA Z21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgfCAy MCArKysrKysrKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5 XzAuYyB8IDIzICsrKysrKysrKysrKysrKysrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDM5IGlu c2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92 OF8wLmMKaW5kZXggNDgyNzk1NC4uOGZkMTA2OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9n ZnhfdjhfMC5jCkBAIC00NzA0LDQwICs0NzA0LDU2IEBAIHN0YXRpYyB2b2lkIGdmeF92OF8wX2tp cV9zZXR0aW5nKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAl0bXAgfD0gKHJpbmctPm1lIDw8 IDUpIHwgKHJpbmctPnBpcGUgPDwgMykgfCAocmluZy0+cXVldWUpOwogCVdSRUczMihtbVJMQ19D UF9TQ0hFRFVMRVJTLCB0bXApOwogCXRtcCB8PSAweDgwOwogCVdSRUczMihtbVJMQ19DUF9TQ0hF RFVMRVJTLCB0bXApOwogfQogCiBzdGF0aWMgaW50IGdmeF92OF8wX2tpcV9rY3FfZW5hYmxlKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCXN0cnVjdCBhbWRncHVfcmluZyAqa2lxX3Jp bmcgPSAmYWRldi0+Z2Z4LmtpcS5yaW5nOwogCXVpbnQzMl90IHNjcmF0Y2gsIHRtcCA9IDA7CisJ dWludDY0X3QgcXVldWVfbWFzayA9IDA7CiAJaW50IHIsIGk7CiAKKwlmb3IgKGkgPSAwOyBpIDwg QU1ER1BVX01BWF9DT01QVVRFX1FVRVVFUzsgKytpKSB7CisJCWlmICghdGVzdF9iaXQoaSwgYWRl di0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXApKQorCQkJY29udGludWU7CisKKwkJLyogVGhpcyBzaXR1 YXRpb24gbWF5IGJlIGhpdCBpbiB0aGUgZnV0dXJlIGlmIGEgbmV3IEhXCisJCSAqIGdlbmVyYXRp b24gZXhwb3NlcyBtb3JlIHRoYW4gNjQgcXVldWVzLiBJZiBzbywgdGhlCisJCSAqIGRlZmluaXRp b24gb2YgcXVldWVfbWFzayBuZWVkcyB1cGRhdGluZyAqLworCQlpZiAoV0FSTl9PTihpID4gKHNp emVvZihxdWV1ZV9tYXNrKSo4KSkpIHsKKwkJCURSTV9FUlJPUigiSW52YWxpZCBLQ1EgZW5hYmxl ZDogJWRcbiIsIGkpOworCQkJYnJlYWs7CisJCX0KKworCQlxdWV1ZV9tYXNrIHw9ICgxdWxsIDw8 IGkpOworCX0KKwogCXIgPSBhbWRncHVfZ2Z4X3NjcmF0Y2hfZ2V0KGFkZXYsICZzY3JhdGNoKTsK IAlpZiAocikgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBnZXQgc2NyYXRjaCByZWcgKCVkKS5c biIsIHIpOwogCQlyZXR1cm4gcjsKIAl9CiAJV1JFRzMyKHNjcmF0Y2gsIDB4Q0FGRURFQUQpOwog CiAJciA9IGFtZGdwdV9yaW5nX2FsbG9jKGtpcV9yaW5nLCAoOCAqIGFkZXYtPmdmeC5udW1fY29t cHV0ZV9yaW5ncykgKyAxMSk7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gbG9j ayBLSVEgKCVkKS5cbiIsIHIpOwogCQlhbWRncHVfZ2Z4X3NjcmF0Y2hfZnJlZShhZGV2LCBzY3Jh dGNoKTsKIAkJcmV0dXJuIHI7CiAJfQogCS8qIHNldCByZXNvdXJjZXMgKi8KIAlhbWRncHVfcmlu Z193cml0ZShraXFfcmluZywgUEFDS0VUMyhQQUNLRVQzX1NFVF9SRVNPVVJDRVMsIDYpKTsKIAlh bWRncHVfcmluZ193cml0ZShraXFfcmluZywgMCk7CS8qIHZtaWRfbWFzazowIHF1ZXVlX3R5cGU6 MCAoS0lRKSAqLwotCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAweDAwMDAwMEZGKTsJLyog cXVldWUgbWFzayBsbyAqLwotCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsJLyogcXVl dWUgbWFzayBoaSAqLworCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCBsb3dlcl8zMl9iaXRz KHF1ZXVlX21hc2spKTsJLyogcXVldWUgbWFzayBsbyAqLworCWFtZGdwdV9yaW5nX3dyaXRlKGtp cV9yaW5nLCB1cHBlcl8zMl9iaXRzKHF1ZXVlX21hc2spKTsJLyogcXVldWUgbWFzayBoaSAqLwog CWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsJLyogZ3dzIG1hc2sgbG8gKi8KIAlhbWRn cHVfcmluZ193cml0ZShraXFfcmluZywgMCk7CS8qIGd3cyBtYXNrIGhpICovCiAJYW1kZ3B1X3Jp bmdfd3JpdGUoa2lxX3JpbmcsIDApOwkvKiBvYWMgbWFzayAqLwogCWFtZGdwdV9yaW5nX3dyaXRl KGtpcV9yaW5nLCAwKTsJLyogZ2RzIGhlYXAgYmFzZTowLCBnZHMgaGVhcCBzaXplOjAgKi8KIAlm b3IgKGkgPSAwOyBpIDwgYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKIAkJc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRlX3JpbmdbaV07CiAJCXVp bnQ2NF90IG1xZF9hZGRyID0gYW1kZ3B1X2JvX2dwdV9vZmZzZXQocmluZy0+bXFkX29iaik7CiAJ CXVpbnQ2NF90IHdwdHJfYWRkciA9IGFkZXYtPndiLmdwdV9hZGRyICsgKHJpbmctPndwdHJfb2Zm cyAqIDQpOwogCiAJCS8qIG1hcCBxdWV1ZXMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhf djlfMC5jCmluZGV4IDIwNjE3MTAuLjc3MjMxMWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2dmeF92OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv Z2Z4X3Y5XzAuYwpAQCAtMTkwNiwyNiArMTkwNiw0NSBAQCBzdGF0aWMgdm9pZCBnZnhfdjlfMF9r aXFfc2V0dGluZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJdG1wID0gUlJFRzMyKFNPQzE1 X1JFR19PRkZTRVQoR0MsIDAsIG1tUkxDX0NQX1NDSEVEVUxFUlMpKTsKIAl0bXAgJj0gMHhmZmZm ZmYwMDsKIAl0bXAgfD0gKHJpbmctPm1lIDw8IDUpIHwgKHJpbmctPnBpcGUgPDwgMykgfCAocmlu Zy0+cXVldWUpOwogCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKEdDLCAwLCBtbVJMQ19DUF9TQ0hF RFVMRVJTKSwgdG1wKTsKIAl0bXAgfD0gMHg4MDsKIAlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChH QywgMCwgbW1STENfQ1BfU0NIRURVTEVSUyksIHRtcCk7CiB9CiAKIHN0YXRpYyB2b2lkIGdmeF92 OV8wX2tpcV9lbmFibGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogeworCWludCBpOworCXN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsKKwl1aW50NjRfdCBxdWV1ZV9t YXNrID0gMDsKKworCWZvciAoaSA9IDA7IGkgPCBBTURHUFVfTUFYX0NPTVBVVEVfUVVFVUVTOyAr K2kpIHsKKwkJaWYgKCF0ZXN0X2JpdChpLCBhZGV2LT5nZngubWVjLnF1ZXVlX2JpdG1hcCkpCisJ CQljb250aW51ZTsKKworCQkvKiBUaGlzIHNpdHVhdGlvbiBtYXkgYmUgaGl0IGluIHRoZSBmdXR1 cmUgaWYgYSBuZXcgSFcKKwkJICogZ2VuZXJhdGlvbiBleHBvc2VzIG1vcmUgdGhhbiA2NCBxdWV1 ZXMuIElmIHNvLCB0aGUKKwkJICogZGVmaW5pdGlvbiBvZiBxdWV1ZV9tYXNrIG5lZWRzIHVwZGF0 aW5nICovCisJCWlmIChXQVJOX09OKGkgPiAoc2l6ZW9mKHF1ZXVlX21hc2spKjgpKSkgeworCQkJ RFJNX0VSUk9SKCJJbnZhbGlkIEtDUSBlbmFibGVkOiAlZFxuIiwgaSk7CisJCQlicmVhazsKKwkJ fQorCisJCXF1ZXVlX21hc2sgfD0gKDF1bGwgPDwgaSk7CisJfQorCiAJYW1kZ3B1X3JpbmdfYWxs b2MocmluZywgOCk7CiAJLyogc2V0IHJlc291cmNlcyAqLwogCWFtZGdwdV9yaW5nX3dyaXRlKHJp bmcsIFBBQ0tFVDMoUEFDS0VUM19TRVRfUkVTT1VSQ0VTLCA2KSk7CiAJYW1kZ3B1X3Jpbmdfd3Jp dGUocmluZywgMCk7CS8qIHZtaWRfbWFzazowIHF1ZXVlX3R5cGU6MCAoS0lRKSAqLwotCWFtZGdw dV9yaW5nX3dyaXRlKHJpbmcsIDB4MDAwMDAwRkYpOwkvKiBxdWV1ZSBtYXNrIGxvICovCi0JYW1k Z3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIHF1ZXVlIG1hc2sgaGkgKi8KKwlhbWRncHVfcmlu Z193cml0ZShyaW5nLCBsb3dlcl8zMl9iaXRzKHF1ZXVlX21hc2spKTsJLyogcXVldWUgbWFzayBs byAqLworCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIHVwcGVyXzMyX2JpdHMocXVldWVfbWFzaykp OwkvKiBxdWV1ZSBtYXNrIGhpICovCiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIGd3 cyBtYXNrIGxvICovCiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIGd3cyBtYXNrIGhp ICovCiAJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIG9hYyBtYXNrICovCiAJYW1kZ3B1 X3Jpbmdfd3JpdGUocmluZywgMCk7CS8qIGdkcyBoZWFwIGJhc2U6MCwgZ2RzIGhlYXAgc2l6ZTow ICovCiAJYW1kZ3B1X3JpbmdfY29tbWl0KHJpbmcpOwogCXVkZWxheSg1MCk7CiB9CiAKIHN0YXRp YyB2b2lkIGdmeF92OV8wX21hcF9xdWV1ZV9lbmFibGUoc3RydWN0IGFtZGdwdV9yaW5nICpraXFf cmluZywKIAkJCQkgICBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCi0tIAoyLjkuMwoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5n IGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==