From: Tom St Denis Subject: [PATCH 4/4] drm/amd/amdgpu: UVD v6 register cleanup Date: Thu, 11 Aug 2016 10:32:53 -0400 Message-ID: <20160811143253.24718-5-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92Nl8wLmMgfCAyNyArKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZfMC5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYwppbmRleCBjMTFiOTdmOGUz NzYuLjdiN2U4Mjg0MGM5NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv dXZkX3Y2XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZfMC5jCkBA IC0zOTcsMTUgKzM5NywxMyBAQCBzdGF0aWMgaW50IHV2ZF92Nl8wX3N0YXJ0KHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2KQogCXV2ZF92Nl8wX21jX3Jlc3VtZShhZGV2KTsKIAogCS8qIGRpc2Fi bGUgY2xvY2sgZ2F0aW5nICovCi0JdG1wID0gUlJFRzMyKG1tVVZEX0NHQ19DVFJMKTsKLQl0bXAg Jj0gflVWRF9DR0NfQ1RSTF9fRFlOX0NMT0NLX01PREVfTUFTSzsKLQlXUkVHMzIobW1VVkRfQ0dD X0NUUkwsIHRtcCk7CisJV1JFRzMyX0ZJRUxEKFVWRF9DR0NfQ1RSTCwgRFlOX0NMT0NLX01PREUs IDApOwogCiAJLyogZGlzYWJsZSBpbnRlcnVwdCAqLwotCVdSRUczMl9QKG1tVVZEX01BU1RJTlRf RU4sIDAsIH5VVkRfTUFTVElOVF9FTl9fVkNQVV9FTl9NQVNLKTsKKwlXUkVHMzJfRklFTEQoVVZE X01BU1RJTlRfRU4sIFZDUFVfRU4sIDApOwogCiAJLyogc3RhbGwgVU1DIGFuZCByZWdpc3RlciBi dXMgYmVmb3JlIHJlc2V0dGluZyBWQ1BVICovCi0JV1JFRzMyX1AobW1VVkRfTE1JX0NUUkwyLCBV VkRfTE1JX0NUUkwyX19TVEFMTF9BUkJfVU1DX01BU0ssIH5VVkRfTE1JX0NUUkwyX19TVEFMTF9B UkJfVU1DX01BU0spOworCVdSRUczMl9GSUVMRChVVkRfTE1JX0NUUkwyLCBTVEFMTF9BUkJfVU1D LCAxKTsKIAltZGVsYXkoMSk7CiAKIAkvKiBwdXQgTE1JLCBWQ1BVLCBSQkMgZXRjLi4uIGludG8g cmVzZXQgKi8KQEAgLTQyMSw3ICs0MTksNyBAQCBzdGF0aWMgaW50IHV2ZF92Nl8wX3N0YXJ0KHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCW1kZWxheSg1KTsKIAogCS8qIHRha2UgVVZEIGJs b2NrIG91dCBvZiByZXNldCAqLwotCVdSRUczMl9QKG1tU1JCTV9TT0ZUX1JFU0VULCAwLCB+U1JC TV9TT0ZUX1JFU0VUX19TT0ZUX1JFU0VUX1VWRF9NQVNLKTsKKwlXUkVHMzJfRklFTEQoU1JCTV9T T0ZUX1JFU0VULCBTT0ZUX1JFU0VUX1VWRCwgMCk7CiAJbWRlbGF5KDUpOwogCiAJLyogaW5pdGlh bGl6ZSBVVkQgbWVtb3J5IGNvbnRyb2xsZXIgKi8KQEAgLTQ1Niw3ICs0NTQsNyBAQCBzdGF0aWMg aW50IHV2ZF92Nl8wX3N0YXJ0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCVdSRUczMiht bVVWRF9WQ1BVX0NOVEwsIFVWRF9WQ1BVX0NOVExfX0NMS19FTl9NQVNLKTsKIAogCS8qIGVuYWJs ZSBVTUMgKi8KLQlXUkVHMzJfUChtbVVWRF9MTUlfQ1RSTDIsIDAsIH5VVkRfTE1JX0NUUkwyX19T VEFMTF9BUkJfVU1DX01BU0spOworCVdSRUczMl9GSUVMRChVVkRfTE1JX0NUUkwyLCBTVEFMTF9B UkJfVU1DLCAwKTsKIAogCS8qIGJvb3QgdXAgdGhlIFZDUFUgKi8KIAlXUkVHMzIobW1VVkRfU09G VF9SRVNFVCwgMCk7CkBAIC00NzYsMTEgKzQ3NCw5IEBAIHN0YXRpYyBpbnQgdXZkX3Y2XzBfc3Rh cnQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCQlicmVhazsKIAogCQlEUk1fRVJST1Io IlVWRCBub3QgcmVzcG9uZGluZywgdHJ5aW5nIHRvIHJlc2V0IHRoZSBWQ1BVISEhXG4iKTsKLQkJ V1JFRzMyX1AobW1VVkRfU09GVF9SRVNFVCwgVVZEX1NPRlRfUkVTRVRfX1ZDUFVfU09GVF9SRVNF VF9NQVNLLAotCQkJCX5VVkRfU09GVF9SRVNFVF9fVkNQVV9TT0ZUX1JFU0VUX01BU0spOworCQlX UkVHMzJfRklFTEQoVVZEX1NPRlRfUkVTRVQsIFZDUFVfU09GVF9SRVNFVCwgMSk7CiAJCW1kZWxh eSgxMCk7Ci0JCVdSRUczMl9QKG1tVVZEX1NPRlRfUkVTRVQsIDAsCi0JCQkgflVWRF9TT0ZUX1JF U0VUX19WQ1BVX1NPRlRfUkVTRVRfTUFTSyk7CisJCVdSRUczMl9GSUVMRChVVkRfU09GVF9SRVNF VCwgVkNQVV9TT0ZUX1JFU0VULCAwKTsKIAkJbWRlbGF5KDEwKTsKIAkJciA9IC0xOwogCX0KQEAg LTQ5NywxNSArNDkzLDE0IEBAIHN0YXRpYyBpbnQgdXZkX3Y2XzBfc3RhcnQoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiAJLyogY2xlYXIgdGhlIGJpdCA0IG9mIFVWRF9TVEFUVVMgKi8KIAlX UkVHMzJfUChtbVVWRF9TVEFUVVMsIDAsIH4oMiA8PCBVVkRfU1RBVFVTX19WQ1BVX1JFUE9SVF9f U0hJRlQpKTsKIAorCS8qIGZvcmNlIFJCQyBpbnRvIGlkbGUgc3RhdGUgKi8KIAlyYl9idWZzeiA9 IG9yZGVyX2Jhc2VfMihyaW5nLT5yaW5nX3NpemUpOwotCXRtcCA9IDA7Ci0JdG1wID0gUkVHX1NF VF9GSUVMRCh0bXAsIFVWRF9SQkNfUkJfQ05UTCwgUkJfQlVGU1osIHJiX2J1ZnN6KTsKKwl0bXAg PSBSRUdfU0VUX0ZJRUxEKDAsIFVWRF9SQkNfUkJfQ05UTCwgUkJfQlVGU1osIHJiX2J1ZnN6KTsK IAl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwgVVZEX1JCQ19SQl9DTlRMLCBSQl9CTEtTWiwgMSk7 CiAJdG1wID0gUkVHX1NFVF9GSUVMRCh0bXAsIFVWRF9SQkNfUkJfQ05UTCwgUkJfTk9fRkVUQ0gs IDEpOwogCXRtcCA9IFJFR19TRVRfRklFTEQodG1wLCBVVkRfUkJDX1JCX0NOVEwsIFJCX1dQVFJf UE9MTF9FTiwgMCk7CiAJdG1wID0gUkVHX1NFVF9GSUVMRCh0bXAsIFVWRF9SQkNfUkJfQ05UTCwg UkJfTk9fVVBEQVRFLCAxKTsKIAl0bXAgPSBSRUdfU0VUX0ZJRUxEKHRtcCwgVVZEX1JCQ19SQl9D TlRMLCBSQl9SUFRSX1dSX0VOLCAxKTsKLQkvKiBmb3JjZSBSQkMgaW50byBpZGxlIHN0YXRlICov CiAJV1JFRzMyKG1tVVZEX1JCQ19SQl9DTlRMLCB0bXApOwogCiAJLyogc2V0IHRoZSB3cml0ZSBw b2ludGVyIGRlbGF5ICovCkBAIC01MjYsNyArNTIxLDcgQEAgc3RhdGljIGludCB1dmRfdjZfMF9z dGFydChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlyaW5nLT53cHRyID0gUlJFRzMyKG1t VVZEX1JCQ19SQl9SUFRSKTsKIAlXUkVHMzIobW1VVkRfUkJDX1JCX1dQVFIsIHJpbmctPndwdHIp OwogCi0JV1JFRzMyX1AobW1VVkRfUkJDX1JCX0NOVEwsIDAsIH5VVkRfUkJDX1JCX0NOVExfX1JC X05PX0ZFVENIX01BU0spOworCVdSRUczMl9GSUVMRChVVkRfUkJDX1JCX0NOVEwsIFJCX05PX0ZF VENILCAwKTsKIAogCXJldHVybiAwOwogfQpAQCAtNzQzLDcgKzczOCw3IEBAIHN0YXRpYyBpbnQg dXZkX3Y2XzBfd2FpdF9mb3JfaWRsZSh2b2lkICpoYW5kbGUpCiAJc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYgPSAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKiloYW5kbGU7CiAKIAlmb3IgKGkgPSAw OyBpIDwgYWRldi0+dXNlY190aW1lb3V0OyBpKyspIHsKLQkJaWYgKCEoUlJFRzMyKG1tU1JCTV9T VEFUVVMpICYgU1JCTV9TVEFUVVNfX1VWRF9CVVNZX01BU0spKQorCQlpZiAodXZkX3Y2XzBfaXNf aWRsZShoYW5kbGUpKQogCQkJcmV0dXJuIDA7CiAJfQogCXJldHVybiAtRVRJTUVET1VUOwotLSAK Mi45LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFt ZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=