From: Andres Rodriguez Subject: [PATCH 14/25] drm/amdgpu: remove hardcoded queue_mask in PACKET3_SET_RESOURCES Date: Tue, 4 Apr 2017 18:05:40 -0400 Message-ID: <20170404220551.8669-15-andresx7@gmail.com> References: <20170404220551.8669-1-andresx7@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170404220551.8669-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 dWV1ZV9iaXRtYXAuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXMgUm9kcmlndWV6IDxhbmRyZXN4N0Bn bWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4XzAuYyB8IDIw ICsrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlf MC5jIHwgMjMgKysrKysrKysrKysrKysrKysrKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzkgaW5z ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nZnhfdjhfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y4 XzAuYwppbmRleCAzYzkwYTI5Li45NTVlNjFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nZnhfdjhfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm eF92OF8wLmMKQEAgLTQ3MDMsNDAgKzQ3MDMsNTYgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y4XzBfa2lx X3NldHRpbmcoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCXRtcCB8PSAocmluZy0+bWUgPDwg NSkgfCAocmluZy0+cGlwZSA8PCAzKSB8IChyaW5nLT5xdWV1ZSk7CiAJV1JFRzMyKG1tUkxDX0NQ X1NDSEVEVUxFUlMsIHRtcCk7CiAJdG1wIHw9IDB4ODA7CiAJV1JFRzMyKG1tUkxDX0NQX1NDSEVE VUxFUlMsIHRtcCk7CiB9CiAKIHN0YXRpYyBpbnQgZ2Z4X3Y4XzBfa2lxX2tjcV9lbmFibGUoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJc3RydWN0IGFtZGdwdV9yaW5nICpraXFfcmlu ZyA9ICZhZGV2LT5nZngua2lxLnJpbmc7CiAJdWludDMyX3Qgc2NyYXRjaCwgdG1wID0gMDsKKwl1 aW50NjRfdCBxdWV1ZV9tYXNrID0gMDsKIAlpbnQgciwgaTsKIAorCWZvciAoaSA9IDA7IGkgPCBB TURHUFVfTUFYX1FVRVVFUzsgKytpKSB7CisJCWlmICghdGVzdF9iaXQoaSwgYWRldi0+Z2Z4Lm1l Yy5xdWV1ZV9iaXRtYXApKQorCQkJY29udGludWU7CisKKwkJLyogVGhpcyBzaXR1YXRpb24gbWF5 IGJlIGhpdCBpbiB0aGUgZnV0dXJlIGlmIGEgbmV3IEhXCisJCSAqIGdlbmVyYXRpb24gZXhwb3Nl cyBtb3JlIHRoYW4gNjQgcXVldWVzLiBJZiBzbywgdGhlCisJCSAqIGRlZmluaXRpb24gb2YgcXVl dWVfbWFzayBuZWVkcyB1cGRhdGluZyAqLworCQlpZiAoV0FSTl9PTihpID4gKHNpemVvZihxdWV1 ZV9tYXNrKSo4KSkpIHsKKwkJCURSTV9FUlJPUigiSW52YWxpZCBLQ1EgZW5hYmxlZDogJWRcbiIs IGkpOworCQkJYnJlYWs7CisJCX0KKworCQlxdWV1ZV9tYXNrIHw9ICgxdWxsIDw8IGkpOworCX0K KwogCXIgPSBhbWRncHVfZ2Z4X3NjcmF0Y2hfZ2V0KGFkZXYsICZzY3JhdGNoKTsKIAlpZiAocikg ewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBnZXQgc2NyYXRjaCByZWcgKCVkKS5cbiIsIHIpOwog CQlyZXR1cm4gcjsKIAl9CiAJV1JFRzMyKHNjcmF0Y2gsIDB4Q0FGRURFQUQpOwogCiAJciA9IGFt ZGdwdV9yaW5nX2FsbG9jKGtpcV9yaW5nLCAoOCAqIGFkZXYtPmdmeC5udW1fY29tcHV0ZV9yaW5n cykgKyAxMSk7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gbG9jayBLSVEgKCVk KS5cbiIsIHIpOwogCQlhbWRncHVfZ2Z4X3NjcmF0Y2hfZnJlZShhZGV2LCBzY3JhdGNoKTsKIAkJ cmV0dXJuIHI7CiAJfQogCS8qIHNldCByZXNvdXJjZXMgKi8KIAlhbWRncHVfcmluZ193cml0ZShr aXFfcmluZywgUEFDS0VUMyhQQUNLRVQzX1NFVF9SRVNPVVJDRVMsIDYpKTsKIAlhbWRncHVfcmlu Z193cml0ZShraXFfcmluZywgMCk7CS8qIHZtaWRfbWFzazowIHF1ZXVlX3R5cGU6MCAoS0lRKSAq LwotCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAweDAwMDAwMEZGKTsJLyogcXVldWUgbWFz ayBsbyAqLwotCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsJLyogcXVldWUgbWFzayBo aSAqLworCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCBsb3dlcl8zMl9iaXRzKHF1ZXVlX21h c2spKTsJLyogcXVldWUgbWFzayBsbyAqLworCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5nLCB1 cHBlcl8zMl9iaXRzKHF1ZXVlX21hc2spKTsJLyogcXVldWUgbWFzayBoaSAqLwogCWFtZGdwdV9y aW5nX3dyaXRlKGtpcV9yaW5nLCAwKTsJLyogZ3dzIG1hc2sgbG8gKi8KIAlhbWRncHVfcmluZ193 cml0ZShraXFfcmluZywgMCk7CS8qIGd3cyBtYXNrIGhpICovCiAJYW1kZ3B1X3Jpbmdfd3JpdGUo a2lxX3JpbmcsIDApOwkvKiBvYWMgbWFzayAqLwogCWFtZGdwdV9yaW5nX3dyaXRlKGtpcV9yaW5n LCAwKTsJLyogZ2RzIGhlYXAgYmFzZTowLCBnZHMgaGVhcCBzaXplOjAgKi8KIAlmb3IgKGkgPSAw OyBpIDwgYWRldi0+Z2Z4Lm51bV9jb21wdXRlX3JpbmdzOyBpKyspIHsKIAkJc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRlX3JpbmdbaV07CiAJCXVpbnQ2NF90IG1x ZF9hZGRyID0gYW1kZ3B1X2JvX2dwdV9vZmZzZXQocmluZy0+bXFkX29iaik7CiAJCXVpbnQ2NF90 IHdwdHJfYWRkciA9IGFkZXYtPndiLmdwdV9hZGRyICsgKHJpbmctPndwdHJfb2ZmcyAqIDQpOwog CiAJCS8qIG1hcCBxdWV1ZXMgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dmeF92OV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjlfMC5jCmlu ZGV4IDk3NmMzOTAuLjBjNjljNjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2dmeF92OV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y5XzAu YwpAQCAtMTkxOCwyNiArMTkxOCw0NSBAQCBzdGF0aWMgdm9pZCBnZnhfdjlfMF9raXFfc2V0dGlu ZyhzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJdG1wID0gUlJFRzMyKFNPQzE1X1JFR19PRkZT RVQoR0MsIDAsIG1tUkxDX0NQX1NDSEVEVUxFUlMpKTsKIAl0bXAgJj0gMHhmZmZmZmYwMDsKIAl0 bXAgfD0gKHJpbmctPm1lIDw8IDUpIHwgKHJpbmctPnBpcGUgPDwgMykgfCAocmluZy0+cXVldWUp OwogCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKEdDLCAwLCBtbVJMQ19DUF9TQ0hFRFVMRVJTKSwg dG1wKTsKIAl0bXAgfD0gMHg4MDsKIAlXUkVHMzIoU09DMTVfUkVHX09GRlNFVChHQywgMCwgbW1S TENfQ1BfU0NIRURVTEVSUyksIHRtcCk7CiB9CiAKIHN0YXRpYyB2b2lkIGdmeF92OV8wX2tpcV9l bmFibGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogeworCWludCBpOworCXN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsKKwl1aW50NjRfdCBxdWV1ZV9tYXNrID0gMDsK KworCWZvciAoaSA9IDA7IGkgPCBBTURHUFVfTUFYX1FVRVVFUzsgKytpKSB7CisJCWlmICghdGVz dF9iaXQoaSwgYWRldi0+Z2Z4Lm1lYy5xdWV1ZV9iaXRtYXApKQorCQkJY29udGludWU7CisKKwkJ LyogVGhpcyBzaXR1YXRpb24gbWF5IGJlIGhpdCBpbiB0aGUgZnV0dXJlIGlmIGEgbmV3IEhXCisJ CSAqIGdlbmVyYXRpb24gZXhwb3NlcyBtb3JlIHRoYW4gNjQgcXVldWVzLiBJZiBzbywgdGhlCisJ CSAqIGRlZmluaXRpb24gb2YgcXVldWVfbWFzayBuZWVkcyB1cGRhdGluZyAqLworCQlpZiAoV0FS Tl9PTihpID4gKHNpemVvZihxdWV1ZV9tYXNrKSo4KSkpIHsKKwkJCURSTV9FUlJPUigiSW52YWxp ZCBLQ1EgZW5hYmxlZDogJWRcbiIsIGkpOworCQkJYnJlYWs7CisJCX0KKworCQlxdWV1ZV9tYXNr IHw9ICgxdWxsIDw8IGkpOworCX0KKwogCWFtZGdwdV9yaW5nX2FsbG9jKHJpbmcsIDgpOwogCS8q IHNldCByZXNvdXJjZXMgKi8KIAlhbWRncHVfcmluZ193cml0ZShyaW5nLCBQQUNLRVQzKFBBQ0tF VDNfU0VUX1JFU09VUkNFUywgNikpOwogCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIDApOwkvKiB2 bWlkX21hc2s6MCBxdWV1ZV90eXBlOjAgKEtJUSkgKi8KLQlhbWRncHVfcmluZ193cml0ZShyaW5n LCAweDAwMDAwMEZGKTsJLyogcXVldWUgbWFzayBsbyAqLwotCWFtZGdwdV9yaW5nX3dyaXRlKHJp bmcsIDApOwkvKiBxdWV1ZSBtYXNrIGhpICovCisJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgbG93 ZXJfMzJfYml0cyhxdWV1ZV9tYXNrKSk7CS8qIHF1ZXVlIG1hc2sgbG8gKi8KKwlhbWRncHVfcmlu Z193cml0ZShyaW5nLCB1cHBlcl8zMl9iaXRzKHF1ZXVlX21hc2spKTsJLyogcXVldWUgbWFzayBo aSAqLwogCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsIDApOwkvKiBnd3MgbWFzayBsbyAqLwogCWFt ZGdwdV9yaW5nX3dyaXRlKHJpbmcsIDApOwkvKiBnd3MgbWFzayBoaSAqLwogCWFtZGdwdV9yaW5n X3dyaXRlKHJpbmcsIDApOwkvKiBvYWMgbWFzayAqLwogCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcs IDApOwkvKiBnZHMgaGVhcCBiYXNlOjAsIGdkcyBoZWFwIHNpemU6MCAqLwogCWFtZGdwdV9yaW5n X2NvbW1pdChyaW5nKTsKIAl1ZGVsYXkoNTApOwogfQogCiBzdGF0aWMgdm9pZCBnZnhfdjlfMF9t YXBfcXVldWVfZW5hYmxlKHN0cnVjdCBhbWRncHVfcmluZyAqa2lxX3JpbmcsCiAJCQkJICAgc3Ry dWN0IGFtZGdwdV9yaW5nICpyaW5nKQotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vYW1kLWdmeAo=