From: Tom St Denis Subject: [PATCH 3/4] drm/amd/amdgpu: VCE v2 register cleanup Date: Thu, 11 Aug 2016 10:32:52 -0400 Message-ID: <20160811143253.24718-4-tom.stdenis@amd.com> References: <20160811143253.24718-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160811143253.24718-1-tom.stdenis-5C7GfCeVMHo@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: Tom St Denis U2lnbmVkLW9mZi1ieTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92Ml8wLmMgfCAzOSArKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDI1 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3Zj ZV92Ml8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92Y2VfdjJfMC5jCmluZGV4IDgw YTM3YTYwMjE4MS4uMjFiYTIxOWU5NDNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS92Y2VfdjJfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZjZV92 Ml8wLmMKQEAgLTEyNywxNSArMTI3LDEwIEBAIHN0YXRpYyBpbnQgdmNlX3YyXzBfc3RhcnQoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJV1JFRzMyKG1tVkNFX1JCX0JBU0VfSEkyLCB1cHBl cl8zMl9iaXRzKHJpbmctPmdwdV9hZGRyKSk7CiAJV1JFRzMyKG1tVkNFX1JCX1NJWkUyLCByaW5n LT5yaW5nX3NpemUgLyA0KTsKIAotCVdSRUczMl9QKG1tVkNFX1ZDUFVfQ05UTCwgVkNFX1ZDUFVf Q05UTF9fQ0xLX0VOX01BU0ssIH5WQ0VfVkNQVV9DTlRMX19DTEtfRU5fTUFTSyk7Ci0KLQlXUkVH MzJfUChtbVZDRV9TT0ZUX1JFU0VULAotCQkgVkNFX1NPRlRfUkVTRVRfX0VDUFVfU09GVF9SRVNF VF9NQVNLLAotCQkgflZDRV9TT0ZUX1JFU0VUX19FQ1BVX1NPRlRfUkVTRVRfTUFTSyk7Ci0KKwlX UkVHMzJfRklFTEQoVkNFX1ZDUFVfQ05UTCwgQ0xLX0VOLCAxKTsKKwlXUkVHMzJfRklFTEQoVkNF X1NPRlRfUkVTRVQsIEVDUFVfU09GVF9SRVNFVCwgMSk7CiAJbWRlbGF5KDEwMCk7Ci0KLQlXUkVH MzJfUChtbVZDRV9TT0ZUX1JFU0VULCAwLCB+VkNFX1NPRlRfUkVTRVRfX0VDUFVfU09GVF9SRVNF VF9NQVNLKTsKKwlXUkVHMzJfRklFTEQoVkNFX1NPRlRfUkVTRVQsIEVDUFVfU09GVF9SRVNFVCwg MCk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgMTA7ICsraSkgewogCQl1aW50MzJfdCBzdGF0dXM7CkBA IC0xNTAsMTAgKzE0NSw5IEBAIHN0YXRpYyBpbnQgdmNlX3YyXzBfc3RhcnQoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiAJCQlicmVhazsKIAogCQlEUk1fRVJST1IoIlZDRSBub3QgcmVzcG9u ZGluZywgdHJ5aW5nIHRvIHJlc2V0IHRoZSBFQ1BVISEhXG4iKTsKLQkJV1JFRzMyX1AobW1WQ0Vf U09GVF9SRVNFVCwgVkNFX1NPRlRfUkVTRVRfX0VDUFVfU09GVF9SRVNFVF9NQVNLLAotCQkJCX5W Q0VfU09GVF9SRVNFVF9fRUNQVV9TT0ZUX1JFU0VUX01BU0spOworCQlXUkVHMzJfRklFTEQoVkNF X1NPRlRfUkVTRVQsIEVDUFVfU09GVF9SRVNFVCwgMSk7CiAJCW1kZWxheSgxMCk7Ci0JCVdSRUcz Ml9QKG1tVkNFX1NPRlRfUkVTRVQsIDAsIH5WQ0VfU09GVF9SRVNFVF9fRUNQVV9TT0ZUX1JFU0VU X01BU0spOworCQlXUkVHMzJfRklFTEQoVkNFX1NPRlRfUkVTRVQsIEVDUFVfU09GVF9SRVNFVCwg MCk7CiAJCW1kZWxheSgxMCk7CiAJCXIgPSAtMTsKIAl9CkBAIC0zNDUsMTMgKzMzOSwxMyBAQCBz dGF0aWMgdm9pZCB2Y2VfdjJfMF9zZXRfZHluX2NnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LCBib29sIGdhdGVkKQogCQkJRFJNX0lORk8oIlZDRSBpcyBidXN5LCBDYW4ndCBzZXQgY2xvY2sg Z2F0ZWluZyIpOwogCQkJcmV0dXJuOwogCQl9Ci0JCVdSRUczMl9QKG1tVkNFX1ZDUFVfQ05UTCwg MCwgflZDRV9WQ1BVX0NOVExfX0NMS19FTl9NQVNLKTsKLQkJV1JFRzMyX1AobW1WQ0VfU09GVF9S RVNFVCwgVkNFX1NPRlRfUkVTRVRfX0VDUFVfU09GVF9SRVNFVF9NQVNLLCB+VkNFX1NPRlRfUkVT RVRfX0VDUFVfU09GVF9SRVNFVF9NQVNLKTsKKwkJV1JFRzMyX0ZJRUxEKFZDRV9WQ1BVX0NOVEws IENMS19FTiwgMCk7CisJCVdSRUczMl9GSUVMRChWQ0VfU09GVF9SRVNFVCwgRUNQVV9TT0ZUX1JF U0VULCAxKTsKIAkJbWRlbGF5KDEwMCk7CiAJCVdSRUczMihtbVZDRV9TVEFUVVMsIDApOwogCX0g ZWxzZSB7Ci0JCVdSRUczMl9QKG1tVkNFX1ZDUFVfQ05UTCwgVkNFX1ZDUFVfQ05UTF9fQ0xLX0VO X01BU0ssIH5WQ0VfVkNQVV9DTlRMX19DTEtfRU5fTUFTSyk7Ci0JCVdSRUczMl9QKG1tVkNFX1NP RlRfUkVTRVQsIFZDRV9TT0ZUX1JFU0VUX19FQ1BVX1NPRlRfUkVTRVRfTUFTSywgflZDRV9TT0ZU X1JFU0VUX19FQ1BVX1NPRlRfUkVTRVRfTUFTSyk7CisJCVdSRUczMl9GSUVMRChWQ0VfVkNQVV9D TlRMLCBDTEtfRU4sIDEpOworCQlXUkVHMzJfRklFTEQoVkNFX1NPRlRfUkVTRVQsIEVDUFVfU09G VF9SRVNFVCwgMSk7CiAJCW1kZWxheSgxMDApOwogCX0KIApAQCAtNDU4LDkgKzQ1Miw3IEBAIHN0 YXRpYyB2b2lkIHZjZV92Ml8wX21jX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikK IAlXUkVHMzIobW1WQ0VfVkNQVV9DQUNIRV9TSVpFMiwgc2l6ZSk7CiAKIAlXUkVHMzJfUChtbVZD RV9MTUlfQ1RSTDIsIDB4MCwgfjB4MTAwKTsKLQotCVdSRUczMl9QKG1tVkNFX1NZU19JTlRfRU4s IFZDRV9TWVNfSU5UX0VOX19WQ0VfU1lTX0lOVF9UUkFQX0lOVEVSUlVQVF9FTl9NQVNLLAotCQkg flZDRV9TWVNfSU5UX0VOX19WQ0VfU1lTX0lOVF9UUkFQX0lOVEVSUlVQVF9FTl9NQVNLKTsKKwlX UkVHMzJfRklFTEQoVkNFX1NZU19JTlRfRU4sIFZDRV9TWVNfSU5UX1RSQVBfSU5URVJSVVBUX0VO LCAxKTsKIAogCXZjZV92Ml8wX2luaXRfY2coYWRldik7CiB9CkBAIC00NzQsMTEgKzQ2NiwxMSBA QCBzdGF0aWMgYm9vbCB2Y2VfdjJfMF9pc19pZGxlKHZvaWQgKmhhbmRsZSkKIAogc3RhdGljIGlu dCB2Y2VfdjJfMF93YWl0X2Zvcl9pZGxlKHZvaWQgKmhhbmRsZSkKIHsKLQl1bnNpZ25lZCBpOwog CXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFu ZGxlOworCXVuc2lnbmVkIGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgYWRldi0+dXNlY190aW1lb3V0 OyBpKyspIHsKLQkJaWYgKCEoUlJFRzMyKG1tU1JCTV9TVEFUVVMyKSAmIFNSQk1fU1RBVFVTMl9f VkNFX0JVU1lfTUFTSykpCisJCWlmICh2Y2VfdjJfMF9pc19pZGxlKGhhbmRsZSkpCiAJCQlyZXR1 cm4gMDsKIAl9CiAJcmV0dXJuIC1FVElNRURPVVQ7CkBAIC00ODgsOCArNDgwLDcgQEAgc3RhdGlj IGludCB2Y2VfdjJfMF9zb2Z0X3Jlc2V0KHZvaWQgKmhhbmRsZSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAotCVdSRUcz Ml9QKG1tU1JCTV9TT0ZUX1JFU0VULCBTUkJNX1NPRlRfUkVTRVRfX1NPRlRfUkVTRVRfVkNFX01B U0ssCi0JCQl+U1JCTV9TT0ZUX1JFU0VUX19TT0ZUX1JFU0VUX1ZDRV9NQVNLKTsKKwlXUkVHMzJf RklFTEQoU1JCTV9TT0ZUX1JFU0VULCBTT0ZUX1JFU0VUX1ZDRSwgMSk7CiAJbWRlbGF5KDUpOwog CiAJcmV0dXJuIHZjZV92Ml8wX3N0YXJ0KGFkZXYpOwpAQCAtNTE2LDEwICs1MDcsOCBAQCBzdGF0 aWMgaW50IHZjZV92Ml8wX3Byb2Nlc3NfaW50ZXJydXB0KHN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2LAogCURSTV9ERUJVRygiSUg6IFZDRVxuIik7CiAJc3dpdGNoIChlbnRyeS0+c3JjX2RhdGEp IHsKIAljYXNlIDA6Ci0JCWFtZGdwdV9mZW5jZV9wcm9jZXNzKCZhZGV2LT52Y2UucmluZ1swXSk7 Ci0JCWJyZWFrOwogCWNhc2UgMToKLQkJYW1kZ3B1X2ZlbmNlX3Byb2Nlc3MoJmFkZXYtPnZjZS5y aW5nWzFdKTsKKwkJYW1kZ3B1X2ZlbmNlX3Byb2Nlc3MoJmFkZXYtPnZjZS5yaW5nW2VudHJ5LT5z cmNfZGF0YV0pOwogCQlicmVhazsKIAlkZWZhdWx0OgogCQlEUk1fRVJST1IoIlVuaGFuZGxlZCBp bnRlcnJ1cHQ6ICVkICVkXG4iLAotLSAKMi45LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vYW1kLWdmeAo=