From mboxrd@z Thu Jan  1 00:00:00 1970
From: James Zhu <James.Zhu-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 2/3] drm/amd/amdgpu: Replace uvd_v6_0_enc_support with
 uvd.num_enc_rings after uvd_v6_0_early_init
Date: Thu, 18 Jan 2018 10:49:52 -0500
Message-ID: <1516290593-6955-2-git-send-email-James.Zhu@amd.com>
References: <1516290593-6955-1-git-send-email-James.Zhu@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: <1516290593-6955-1-git-send-email-James.Zhu-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

U2lnbmVkLW9mZi1ieTogSmFtZXMgWmh1IDxKYW1lcy5aaHVAYW1kLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZfMC5jIHwgNTUgKysrKysrKysrKysrKysrLS0tLS0t
LS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAzMiBkZWxl
dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZf
MC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYwppbmRleCA2MTI0NTVk
Li4zMTlkNGIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZf
MC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92Nl8wLmMKQEAgLTQwMiwx
NyArNDAyLDE2IEBAIHN0YXRpYyBpbnQgdXZkX3Y2XzBfc3dfaW5pdCh2b2lkICpoYW5kbGUpCiAJ
aWYgKHIpCiAJCXJldHVybiByOwogCi0JLyogVVZEIEVOQyBUUkFQICovCi0JaWYgKHV2ZF92Nl8w
X2VuY19zdXBwb3J0KGFkZXYpKSB7CisJaWYgKGFkZXYtPnV2ZC5udW1fZW5jX3JpbmdzKSB7CisJ
CXN0cnVjdCBkcm1fc2NoZWRfcnEgKnJxOworCisJCS8qIFVWRCBFTkMgVFJBUCAqLwogCQlmb3Ig
KGkgPSAwOyBpIDwgYWRldi0+dXZkLm51bV9lbmNfcmluZ3M7ICsraSkgewogCQkJciA9IGFtZGdw
dV9pcnFfYWRkX2lkKGFkZXYsIEFNREdQVV9JSF9DTElFTlRJRF9MRUdBQ1ksIGkgKyAxMTksICZh
ZGV2LT51dmQuaXJxKTsKIAkJCWlmIChyKQogCQkJCXJldHVybiByOwogCQl9Ci0JfQogCi0JaWYg
KHV2ZF92Nl8wX2VuY19zdXBwb3J0KGFkZXYpKSB7Ci0JCXN0cnVjdCBkcm1fc2NoZWRfcnEgKnJx
OwogCQlyaW5nID0gJmFkZXYtPnV2ZC5yaW5nX2VuY1swXTsKIAkJcnEgPSAmcmluZy0+c2NoZWQu
c2NoZWRfcnFbRFJNX1NDSEVEX1BSSU9SSVRZX05PUk1BTF07CiAJCXIgPSBkcm1fc2NoZWRfZW50
aXR5X2luaXQoJnJpbmctPnNjaGVkLCAmYWRldi0+dXZkLmVudGl0eV9lbmMsCkBAIC00MzMsMTQg
KzQzMiwxMiBAQCBzdGF0aWMgaW50IHV2ZF92Nl8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCWlm
IChyKQogCQlyZXR1cm4gcjsKIAotCWlmICh1dmRfdjZfMF9lbmNfc3VwcG9ydChhZGV2KSkgewot
CQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm51bV9lbmNfcmluZ3M7ICsraSkgewotCQkJcmlu
ZyA9ICZhZGV2LT51dmQucmluZ19lbmNbaV07Ci0JCQlzcHJpbnRmKHJpbmctPm5hbWUsICJ1dmRf
ZW5jJWQiLCBpKTsKLQkJCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDUxMiwgJmFk
ZXYtPnV2ZC5pcnEsIDApOwotCQkJaWYgKHIpCi0JCQkJcmV0dXJuIHI7Ci0JCX0KKwlmb3IgKGkg
PSAwOyBpIDwgYWRldi0+dXZkLm51bV9lbmNfcmluZ3M7ICsraSkgeworCQlyaW5nID0gJmFkZXYt
PnV2ZC5yaW5nX2VuY1tpXTsKKwkJc3ByaW50ZihyaW5nLT5uYW1lLCAidXZkX2VuYyVkIiwgaSk7
CisJCXIgPSBhbWRncHVfcmluZ19pbml0KGFkZXYsIHJpbmcsIDUxMiwgJmFkZXYtPnV2ZC5pcnEs
IDApOworCQlpZiAocikKKwkJCXJldHVybiByOwogCX0KIAogCXJldHVybiByOwpAQCAtNDU1LDcg
KzQ1Miw3IEBAIHN0YXRpYyBpbnQgdXZkX3Y2XzBfc3dfZmluaSh2b2lkICpoYW5kbGUpCiAJaWYg
KHIpCiAJCXJldHVybiByOwogCi0JaWYgKHV2ZF92Nl8wX2VuY19zdXBwb3J0KGFkZXYpKSB7CisJ
aWYgKGFkZXYtPnV2ZC5udW1fZW5jX3JpbmdzKSB7CiAJCWRybV9zY2hlZF9lbnRpdHlfZmluaSgm
YWRldi0+dXZkLnJpbmdfZW5jWzBdLnNjaGVkLCAmYWRldi0+dXZkLmVudGl0eV9lbmMpOwogCiAJ
CWZvciAoaSA9IDA7IGkgPCBhZGV2LT51dmQubnVtX2VuY19yaW5nczsgKytpKQpAQCAtNTE3LDIx
ICs1MTQsMTkgQEAgc3RhdGljIGludCB1dmRfdjZfMF9od19pbml0KHZvaWQgKmhhbmRsZSkKIAog
CWFtZGdwdV9yaW5nX2NvbW1pdChyaW5nKTsKIAotCWlmICh1dmRfdjZfMF9lbmNfc3VwcG9ydChh
ZGV2KSkgewotCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXZkLm51bV9lbmNfcmluZ3M7ICsraSkg
ewotCQkJcmluZyA9ICZhZGV2LT51dmQucmluZ19lbmNbaV07Ci0JCQlyaW5nLT5yZWFkeSA9IHRy
dWU7Ci0JCQlyID0gYW1kZ3B1X3JpbmdfdGVzdF9yaW5nKHJpbmcpOwotCQkJaWYgKHIpIHsKLQkJ
CQlyaW5nLT5yZWFkeSA9IGZhbHNlOwotCQkJCWdvdG8gZG9uZTsKLQkJCX0KKwlmb3IgKGkgPSAw
OyBpIDwgYWRldi0+dXZkLm51bV9lbmNfcmluZ3M7ICsraSkgeworCQlyaW5nID0gJmFkZXYtPnV2
ZC5yaW5nX2VuY1tpXTsKKwkJcmluZy0+cmVhZHkgPSB0cnVlOworCQlyID0gYW1kZ3B1X3Jpbmdf
dGVzdF9yaW5nKHJpbmcpOworCQlpZiAocikgeworCQkJcmluZy0+cmVhZHkgPSBmYWxzZTsKKwkJ
CWdvdG8gZG9uZTsKIAkJfQogCX0KIAogZG9uZToKIAlpZiAoIXIpIHsKLQkJaWYgKHV2ZF92Nl8w
X2VuY19zdXBwb3J0KGFkZXYpKQorCQlpZiAoYWRldi0+dXZkLm51bV9lbmNfcmluZ3MpCiAJCQlE
Uk1fSU5GTygiVVZEIGFuZCBVVkQgRU5DIGluaXRpYWxpemVkIHN1Y2Nlc3NmdWxseS5cbiIpOwog
CQllbHNlCiAJCQlEUk1fSU5GTygiVVZEIGluaXRpYWxpemVkIHN1Y2Nlc3NmdWxseS5cbiIpOwpA
QCAtODUyLDcgKzg0Nyw3IEBAIHN0YXRpYyBpbnQgdXZkX3Y2XzBfc3RhcnQoc3RydWN0IGFtZGdw
dV9kZXZpY2UgKmFkZXYpCiAKIAlXUkVHMzJfRklFTEQoVVZEX1JCQ19SQl9DTlRMLCBSQl9OT19G
RVRDSCwgMCk7CiAKLQlpZiAodXZkX3Y2XzBfZW5jX3N1cHBvcnQoYWRldikpIHsKKwlpZiAoYWRl
di0+dXZkLm51bV9lbmNfcmluZ3MpIHsKIAkJcmluZyA9ICZhZGV2LT51dmQucmluZ19lbmNbMF07
CiAJCVdSRUczMihtbVVWRF9SQl9SUFRSLCBsb3dlcl8zMl9iaXRzKHJpbmctPndwdHIpKTsKIAkJ
V1JFRzMyKG1tVVZEX1JCX1dQVFIsIGxvd2VyXzMyX2JpdHMocmluZy0+d3B0cikpOwpAQCAtMTI1
NCwxMyArMTI0OSwxMyBAQCBzdGF0aWMgaW50IHV2ZF92Nl8wX3Byb2Nlc3NfaW50ZXJydXB0KHN0
cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQlhbWRncHVfZmVuY2VfcHJvY2VzcygmYWRldi0+
dXZkLnJpbmcpOwogCQlicmVhazsKIAljYXNlIDExOToKLQkJaWYgKGxpa2VseSh1dmRfdjZfMF9l
bmNfc3VwcG9ydChhZGV2KSkpCisJCWlmIChsaWtlbHkoYWRldi0+dXZkLm51bV9lbmNfcmluZ3Mp
KQogCQkJYW1kZ3B1X2ZlbmNlX3Byb2Nlc3MoJmFkZXYtPnV2ZC5yaW5nX2VuY1swXSk7CiAJCWVs
c2UKIAkJCWludF9oYW5kbGVkID0gZmFsc2U7CiAJCWJyZWFrOwogCWNhc2UgMTIwOgotCQlpZiAo
bGlrZWx5KHV2ZF92Nl8wX2VuY19zdXBwb3J0KGFkZXYpKSkKKwkJaWYgKGxpa2VseShhZGV2LT51
dmQubnVtX2VuY19yaW5ncykpCiAJCQlhbWRncHVfZmVuY2VfcHJvY2VzcygmYWRldi0+dXZkLnJp
bmdfZW5jWzFdKTsKIAkJZWxzZQogCQkJaW50X2hhbmRsZWQgPSBmYWxzZTsKQEAgLTE2NTIsMTEg
KzE2NDcsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9pcnFfc3JjX2Z1bmNzIHV2ZF92
Nl8wX2lycV9mdW5jcyA9IHsKIAogc3RhdGljIHZvaWQgdXZkX3Y2XzBfc2V0X2lycV9mdW5jcyhz
dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKLQlpZiAodXZkX3Y2XzBfZW5jX3N1cHBvcnQo
YWRldikpCi0JCWFkZXYtPnV2ZC5pcnEubnVtX3R5cGVzID0gYWRldi0+dXZkLm51bV9lbmNfcmlu
Z3MgKyAxOwotCWVsc2UKLQkJYWRldi0+dXZkLmlycS5udW1fdHlwZXMgPSAxOwotCisJYWRldi0+
dXZkLmlycS5udW1fdHlwZXMgPSBhZGV2LT51dmQubnVtX2VuY19yaW5ncyArIDE7CiAJYWRldi0+
dXZkLmlycS5mdW5jcyA9ICZ1dmRfdjZfMF9pcnFfZnVuY3M7CiB9CiAKLS0gCjIuNy40CgpfX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxp
bmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk
ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK