From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Deucher <alexdeucher-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 2/2] drm/amdgpu/vce: simplify vce instance setup
Date: Mon, 25 Jun 2018 12:42:35 -0500
Message-ID: <20180625174235.29172-2-alexander.deucher@amd.com>
References: <20180625174235.29172-1-alexander.deucher@amd.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
In-Reply-To: <20180625174235.29172-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
List-Id: Discussion list for AMD gfx <amd-gfx.lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/amd-gfx>
List-Post: <mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
List-Help: <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/amd-gfx>,
 <mailto:amd-gfx-request-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org?subject=subscribe>
Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Sender: "amd-gfx" <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>

U2V0IHRoZSBtZSBpbnN0YW5jZSBpbiBlYXJseSBpbml0IGFuZCB1c2UgdGhhdCByYXRoZXIgdGhh
bgpjYWxjdWxhdGluZyB0aGUgaW5zdGFuY2UgYmFzZWQgb24gdGhlIHJpbmcgcG9pbnRlci4KClNp
Z25lZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0t
CiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjJfMC5jIHwgMTAgKysrKysrLS0tLQog
ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3YzXzAuYyB8IDIwICsrKysrKysrKysrKy0t
LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjRfMC5jIHwgMTYgKysrKysr
KysrLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjJfMC5j
IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3YyXzAuYwppbmRleCA0N2Y3MDgyNzE5
NWIuLmQ0OGU4NzdiNjgyZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv
dmNlX3YyXzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjJfMC5jCkBA
IC01Niw3ICs1Niw3IEBAIHN0YXRpYyB1aW50NjRfdCB2Y2VfdjJfMF9yaW5nX2dldF9ycHRyKHN0
cnVjdCBhbWRncHVfcmluZyAqcmluZykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9
IHJpbmctPmFkZXY7CiAKLQlpZiAocmluZyA9PSAmYWRldi0+dmNlLnJpbmdbMF0pCisJaWYgKHJp
bmctPm1lID09IDApCiAJCXJldHVybiBSUkVHMzIobW1WQ0VfUkJfUlBUUik7CiAJZWxzZQogCQly
ZXR1cm4gUlJFRzMyKG1tVkNFX1JCX1JQVFIyKTsKQEAgLTczLDcgKzczLDcgQEAgc3RhdGljIHVp
bnQ2NF90IHZjZV92Ml8wX3JpbmdfZ2V0X3dwdHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQog
ewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsKIAotCWlmIChyaW5n
ID09ICZhZGV2LT52Y2UucmluZ1swXSkKKwlpZiAocmluZy0+bWUgPT0gMCkKIAkJcmV0dXJuIFJS
RUczMihtbVZDRV9SQl9XUFRSKTsKIAllbHNlCiAJCXJldHVybiBSUkVHMzIobW1WQ0VfUkJfV1BU
UjIpOwpAQCAtOTAsNyArOTAsNyBAQCBzdGF0aWMgdm9pZCB2Y2VfdjJfMF9yaW5nX3NldF93cHRy
KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl
diA9IHJpbmctPmFkZXY7CiAKLQlpZiAocmluZyA9PSAmYWRldi0+dmNlLnJpbmdbMF0pCisJaWYg
KHJpbmctPm1lID09IDApCiAJCVdSRUczMihtbVZDRV9SQl9XUFRSLCBsb3dlcl8zMl9iaXRzKHJp
bmctPndwdHIpKTsKIAllbHNlCiAJCVdSRUczMihtbVZDRV9SQl9XUFRSMiwgbG93ZXJfMzJfYml0
cyhyaW5nLT53cHRyKSk7CkBAIC02MjcsOCArNjI3LDEwIEBAIHN0YXRpYyB2b2lkIHZjZV92Ml8w
X3NldF9yaW5nX2Z1bmNzKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCWludCBpOwog
Ci0JZm9yIChpID0gMDsgaSA8IGFkZXYtPnZjZS5udW1fcmluZ3M7IGkrKykKKwlmb3IgKGkgPSAw
OyBpIDwgYWRldi0+dmNlLm51bV9yaW5nczsgaSsrKSB7CiAJCWFkZXYtPnZjZS5yaW5nW2ldLmZ1
bmNzID0gJnZjZV92Ml8wX3JpbmdfZnVuY3M7CisJCWFkZXYtPnZjZS5yaW5nW2ldLm1lID0gaTsK
Kwl9CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYW1kZ3B1X2lycV9zcmNfZnVuY3MgdmNlX3Yy
XzBfaXJxX2Z1bmNzID0gewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv
dmNlX3YzXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92M18wLmMKaW5kZXgg
MDk5OWM4NDNmNjIzLi4yMzkyN2NkZmJjMjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h
bWQvYW1kZ3B1L3ZjZV92M18wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNl
X3YzXzAuYwpAQCAtODYsOSArODYsOSBAQCBzdGF0aWMgdWludDY0X3QgdmNlX3YzXzBfcmluZ19n
ZXRfcnB0cihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJZWxzZSBpZiAoYWRldi0+dmNlLmhh
cnZlc3RfY29uZmlnID09IEFNREdQVV9WQ0VfSEFSVkVTVF9WQ0UwKQogCQlXUkVHMzIobW1HUkJN
X0dGWF9JTkRFWCwgR0VUX1ZDRV9JTlNUQU5DRSgxKSk7CiAKLQlpZiAocmluZyA9PSAmYWRldi0+
dmNlLnJpbmdbMF0pCisJaWYgKHJpbmctPm1lID09IDApCiAJCXYgPSBSUkVHMzIobW1WQ0VfUkJf
UlBUUik7Ci0JZWxzZSBpZiAocmluZyA9PSAmYWRldi0+dmNlLnJpbmdbMV0pCisJZWxzZSBpZiAo
cmluZy0+bWUgPT0gMSkKIAkJdiA9IFJSRUczMihtbVZDRV9SQl9SUFRSMik7CiAJZWxzZQogCQl2
ID0gUlJFRzMyKG1tVkNFX1JCX1JQVFIzKTsKQEAgLTExOCw5ICsxMTgsOSBAQCBzdGF0aWMgdWlu
dDY0X3QgdmNlX3YzXzBfcmluZ19nZXRfd3B0cihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJ
ZWxzZSBpZiAoYWRldi0+dmNlLmhhcnZlc3RfY29uZmlnID09IEFNREdQVV9WQ0VfSEFSVkVTVF9W
Q0UwKQogCQlXUkVHMzIobW1HUkJNX0dGWF9JTkRFWCwgR0VUX1ZDRV9JTlNUQU5DRSgxKSk7CiAK
LQlpZiAocmluZyA9PSAmYWRldi0+dmNlLnJpbmdbMF0pCisJaWYgKHJpbmctPm1lID09IDApCiAJ
CXYgPSBSUkVHMzIobW1WQ0VfUkJfV1BUUik7Ci0JZWxzZSBpZiAocmluZyA9PSAmYWRldi0+dmNl
LnJpbmdbMV0pCisJZWxzZSBpZiAocmluZy0+bWUgPT0gMSkKIAkJdiA9IFJSRUczMihtbVZDRV9S
Ql9XUFRSMik7CiAJZWxzZQogCQl2ID0gUlJFRzMyKG1tVkNFX1JCX1dQVFIzKTsKQEAgLTE0OSw5
ICsxNDksOSBAQCBzdGF0aWMgdm9pZCB2Y2VfdjNfMF9yaW5nX3NldF93cHRyKHN0cnVjdCBhbWRn
cHVfcmluZyAqcmluZykKIAllbHNlIGlmIChhZGV2LT52Y2UuaGFydmVzdF9jb25maWcgPT0gQU1E
R1BVX1ZDRV9IQVJWRVNUX1ZDRTApCiAJCVdSRUczMihtbUdSQk1fR0ZYX0lOREVYLCBHRVRfVkNF
X0lOU1RBTkNFKDEpKTsKIAotCWlmIChyaW5nID09ICZhZGV2LT52Y2UucmluZ1swXSkKKwlpZiAo
cmluZy0+bWUgPT0gMCkKIAkJV1JFRzMyKG1tVkNFX1JCX1dQVFIsIGxvd2VyXzMyX2JpdHMocmlu
Zy0+d3B0cikpOwotCWVsc2UgaWYgKHJpbmcgPT0gJmFkZXYtPnZjZS5yaW5nWzFdKQorCWVsc2Ug
aWYgKHJpbmctPm1lID09IDEpCiAJCVdSRUczMihtbVZDRV9SQl9XUFRSMiwgbG93ZXJfMzJfYml0
cyhyaW5nLT53cHRyKSk7CiAJZWxzZQogCQlXUkVHMzIobW1WQ0VfUkJfV1BUUjMsIGxvd2VyXzMy
X2JpdHMocmluZy0+d3B0cikpOwpAQCAtOTQyLDEyICs5NDIsMTYgQEAgc3RhdGljIHZvaWQgdmNl
X3YzXzBfc2V0X3JpbmdfZnVuY3Moc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJaW50IGk7
CiAKIAlpZiAoYWRldi0+YXNpY190eXBlID49IENISVBfU1RPTkVZKSB7Ci0JCWZvciAoaSA9IDA7
IGkgPCBhZGV2LT52Y2UubnVtX3JpbmdzOyBpKyspCisJCWZvciAoaSA9IDA7IGkgPCBhZGV2LT52
Y2UubnVtX3JpbmdzOyBpKyspIHsKIAkJCWFkZXYtPnZjZS5yaW5nW2ldLmZ1bmNzID0gJnZjZV92
M18wX3Jpbmdfdm1fZnVuY3M7CisJCQlhZGV2LT52Y2UucmluZ1tpXS5tZSA9IGk7CisJCX0KIAkJ
RFJNX0lORk8oIlZDRSBlbmFibGVkIGluIFZNIG1vZGVcbiIpOwogCX0gZWxzZSB7Ci0JCWZvciAo
aSA9IDA7IGkgPCBhZGV2LT52Y2UubnVtX3JpbmdzOyBpKyspCisJCWZvciAoaSA9IDA7IGkgPCBh
ZGV2LT52Y2UubnVtX3JpbmdzOyBpKyspIHsKIAkJCWFkZXYtPnZjZS5yaW5nW2ldLmZ1bmNzID0g
JnZjZV92M18wX3JpbmdfcGh5c19mdW5jczsKKwkJCWFkZXYtPnZjZS5yaW5nW2ldLm1lID0gaTsK
KwkJfQogCQlEUk1fSU5GTygiVkNFIGVuYWJsZWQgaW4gcGh5c2ljYWwgbW9kZVxuIik7CiAJfQog
fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3Y0XzAuYyBiL2Ry
aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92NF8wLmMKaW5kZXggOGZkMWI3NDI5ODVhLi41
NzViZjk3MDkzODkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92
NF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmNlX3Y0XzAuYwpAQCAtNjAs
OSArNjAsOSBAQCBzdGF0aWMgdWludDY0X3QgdmNlX3Y0XzBfcmluZ19nZXRfcnB0cihzdHJ1Y3Qg
YW1kZ3B1X3JpbmcgKnJpbmcpCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5n
LT5hZGV2OwogCi0JaWYgKHJpbmcgPT0gJmFkZXYtPnZjZS5yaW5nWzBdKQorCWlmIChyaW5nLT5t
ZSA9PSAwKQogCQlyZXR1cm4gUlJFRzMyKFNPQzE1X1JFR19PRkZTRVQoVkNFLCAwLCBtbVZDRV9S
Ql9SUFRSKSk7Ci0JZWxzZSBpZiAocmluZyA9PSAmYWRldi0+dmNlLnJpbmdbMV0pCisJZWxzZSBp
ZiAocmluZy0+bWUgPT0gMSkKIAkJcmV0dXJuIFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFZDRSwg
MCwgbW1WQ0VfUkJfUlBUUjIpKTsKIAllbHNlCiAJCXJldHVybiBSUkVHMzIoU09DMTVfUkVHX09G
RlNFVChWQ0UsIDAsIG1tVkNFX1JCX1JQVFIzKSk7CkBAIC04Miw5ICs4Miw5IEBAIHN0YXRpYyB1
aW50NjRfdCB2Y2VfdjRfMF9yaW5nX2dldF93cHRyKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykK
IAlpZiAocmluZy0+dXNlX2Rvb3JiZWxsKQogCQlyZXR1cm4gYWRldi0+d2Iud2JbcmluZy0+d3B0
cl9vZmZzXTsKIAotCWlmIChyaW5nID09ICZhZGV2LT52Y2UucmluZ1swXSkKKwlpZiAocmluZy0+
bWUgPT0gMCkKIAkJcmV0dXJuIFJSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFZDRSwgMCwgbW1WQ0Vf
UkJfV1BUUikpOwotCWVsc2UgaWYgKHJpbmcgPT0gJmFkZXYtPnZjZS5yaW5nWzFdKQorCWVsc2Ug
aWYgKHJpbmctPm1lID09IDEpCiAJCXJldHVybiBSUkVHMzIoU09DMTVfUkVHX09GRlNFVChWQ0Us
IDAsIG1tVkNFX1JCX1dQVFIyKSk7CiAJZWxzZQogCQlyZXR1cm4gUlJFRzMyKFNPQzE1X1JFR19P
RkZTRVQoVkNFLCAwLCBtbVZDRV9SQl9XUFRSMykpOwpAQCAtMTA4LDEwICsxMDgsMTAgQEAgc3Rh
dGljIHZvaWQgdmNlX3Y0XzBfcmluZ19zZXRfd3B0cihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcp
CiAJCXJldHVybjsKIAl9CiAKLQlpZiAocmluZyA9PSAmYWRldi0+dmNlLnJpbmdbMF0pCisJaWYg
KHJpbmctPm1lID09IDApCiAJCVdSRUczMihTT0MxNV9SRUdfT0ZGU0VUKFZDRSwgMCwgbW1WQ0Vf
UkJfV1BUUiksCiAJCQlsb3dlcl8zMl9iaXRzKHJpbmctPndwdHIpKTsKLQllbHNlIGlmIChyaW5n
ID09ICZhZGV2LT52Y2UucmluZ1sxXSkKKwllbHNlIGlmIChyaW5nLT5tZSA9PSAxKQogCQlXUkVH
MzIoU09DMTVfUkVHX09GRlNFVChWQ0UsIDAsIG1tVkNFX1JCX1dQVFIyKSwKIAkJCWxvd2VyXzMy
X2JpdHMocmluZy0+d3B0cikpOwogCWVsc2UKQEAgLTEwODgsOCArMTA4OCwxMCBAQCBzdGF0aWMg
dm9pZCB2Y2VfdjRfMF9zZXRfcmluZ19mdW5jcyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK
IHsKIAlpbnQgaTsKIAotCWZvciAoaSA9IDA7IGkgPCBhZGV2LT52Y2UubnVtX3JpbmdzOyBpKysp
CisJZm9yIChpID0gMDsgaSA8IGFkZXYtPnZjZS5udW1fcmluZ3M7IGkrKykgewogCQlhZGV2LT52
Y2UucmluZ1tpXS5mdW5jcyA9ICZ2Y2VfdjRfMF9yaW5nX3ZtX2Z1bmNzOworCQlhZGV2LT52Y2Uu
cmluZ1tpXS5tZSA9IGk7CisJfQogCURSTV9JTkZPKCJWQ0UgZW5hYmxlZCBpbiBWTSBtb2RlXG4i
KTsKIH0KIAotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w
Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1n
ZngK