From: Piotr Redlewski Subject: [PATCH] drm/amd/amdgpu: fix UVD mc offsets Date: Fri, 10 Nov 2017 12:34:26 +0100 Message-ID: <20171110113426.20790-1-predlewski@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 V2hlbiBVVkQgYm8gaXMgY3JlYXRlZCwgaXRzIHNpemUgaXMgYmFzZWQgb24gdGhlIGluZm9ybWF0 aW9uIGZyb20gZmlybXdhcmUKaGVhZGVyICh1Y29kZV9zaXplX2J5dGVzKS4gVGhlIHNhbWUgdmFs dWUgc2hvdWxkIGJlIGJlIHVzZWQgd2hlbiBwcm9ncmFtbWluZwpVVkQgbWMgY29udHJvbGxlciBv ZmZzZXRzLCBvdGhlcndpc2UgaXQgY2FuIGhhcHBlbiB0aGF0CihtbVVWRF9WQ1BVX0NBQ0hFX09G RlNFVDIgKyBtbVVWRF9WQ1BVX0NBQ0hFX1NJWkUyKSB3aWxsIHBvaW50CkFNREdQVV9HUFVfUEFH RV9TSVpFIGJ5dGVzIGFmdGVyIHRoZSBVVkQgYm8gZW5kLgoKU2Vjb25kIGlzc3VlIGlzIHRoYXQg d2hlbiBwcm9ncmFtbWluZyB0aGUgbW1VVkRfVkNQVV9DQUNIRV9TSVpFMCByZWdpc3RlciwKQU1E R1BVX1VWRF9GSVJNV0FSRV9PRkZTRVQgc2hvdWxkIGJlIHRha2VuIGludG8gYWNjb3VudC4gSWYg aXQgaXNuJ3QsCihtbVVWRF9WQ1BVX0NBQ0hFX09GRlNFVDIgKyBtbVVWRF9WQ1BVX0NBQ0hFX1NJ WkUyKSB3aWxsIGFsd2F5cyBwb2ludApBTURHUFVfVVZEX0ZJUk1XQVJFX09GRlNFVCBieXRlcyBh ZnRlciB0aGUgVVZEIGJvIGVuZC4KClNpZ25lZC1vZmYtYnk6IFBpb3RyIFJlZGxld3NraSA8cHJl ZGxld3NraUBnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y0 XzIuYyB8IDUgKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92NV8wLmMgfCA1 ICsrKystCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZfMC5jIHwgNSArKysrLQog ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y3XzAuYyB8IDcgKysrKysrLQogNCBmaWxl cyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92NF8yLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS91dmRfdjRfMi5jCmluZGV4IDE1NzcxYTUzMDM4ZS4uYWExNzE0NjRmMjAzIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjRfMi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92NF8yLmMKQEAgLTU2MCwxMCArNTYwLDEzIEBA IHN0YXRpYyB2b2lkIHV2ZF92NF8yX21jX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl dikKIHsKIAl1aW50NjRfdCBhZGRyOwogCXVpbnQzMl90IHNpemU7CisJY29uc3Qgc3RydWN0IGNv bW1vbl9maXJtd2FyZV9oZWFkZXIgKmhkcjsKIAogCS8qIHByb2dyYW1tIHRoZSBWQ1BVIG1lbW9y eSBjb250cm9sbGVyIGJpdHMgMC0yNyAqLwogCWFkZHIgPSAoYWRldi0+dXZkLmdwdV9hZGRyICsg QU1ER1BVX1VWRF9GSVJNV0FSRV9PRkZTRVQpID4+IDM7Ci0Jc2l6ZSA9IEFNREdQVV9HUFVfUEFH RV9BTElHTihhZGV2LT51dmQuZnctPnNpemUgKyA0KSA+PiAzOworCWhkciA9IChjb25zdCBzdHJ1 Y3QgY29tbW9uX2Zpcm13YXJlX2hlYWRlciAqKWFkZXYtPnV2ZC5mdy0+ZGF0YTsKKwlzaXplID0g KEFNREdQVV9HUFVfUEFHRV9BTElHTihsZTMyX3RvX2NwdShoZHItPnVjb2RlX3NpemVfYnl0ZXMp ICsgOCkgLQorCQlBTURHUFVfVVZEX0ZJUk1XQVJFX09GRlNFVCkgPj4gMzsKIAlXUkVHMzIobW1V VkRfVkNQVV9DQUNIRV9PRkZTRVQwLCBhZGRyKTsKIAlXUkVHMzIobW1VVkRfVkNQVV9DQUNIRV9T SVpFMCwgc2l6ZSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2 ZF92NV8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjVfMC5jCmluZGV4IDNi MjlhYWJhNzgzYS4uN2RhZjRlOTJhYThiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS91dmRfdjVfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92 NV8wLmMKQEAgLTI1MCw2ICsyNTAsNyBAQCBzdGF0aWMgdm9pZCB1dmRfdjVfMF9tY19yZXN1bWUo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7CiAJdWludDY0X3Qgb2Zmc2V0OwogCXVpbnQz Ml90IHNpemU7CisJY29uc3Qgc3RydWN0IGNvbW1vbl9maXJtd2FyZV9oZWFkZXIgKmhkcjsKIAog CS8qIHByb2dyYW1tIG1lbW9yeSBjb250cm9sbGVyIGJpdHMgMC0yNyAqLwogCVdSRUczMihtbVVW RF9MTUlfVkNQVV9DQUNIRV82NEJJVF9CQVJfTE9XLApAQCAtMjU4LDcgKzI1OSw5IEBAIHN0YXRp YyB2b2lkIHV2ZF92NV8wX21jX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJ CXVwcGVyXzMyX2JpdHMoYWRldi0+dXZkLmdwdV9hZGRyKSk7CiAKIAlvZmZzZXQgPSBBTURHUFVf VVZEX0ZJUk1XQVJFX09GRlNFVDsKLQlzaXplID0gQU1ER1BVX0dQVV9QQUdFX0FMSUdOKGFkZXYt PnV2ZC5mdy0+c2l6ZSArIDQpOworCWhkciA9IChjb25zdCBzdHJ1Y3QgY29tbW9uX2Zpcm13YXJl X2hlYWRlciAqKWFkZXYtPnV2ZC5mdy0+ZGF0YTsKKwlzaXplID0gQU1ER1BVX0dQVV9QQUdFX0FM SUdOKGxlMzJfdG9fY3B1KGhkci0+dWNvZGVfc2l6ZV9ieXRlcykgKyA4KSAtCisJICAgICAgIEFN REdQVV9VVkRfRklSTVdBUkVfT0ZGU0VUOwogCVdSRUczMihtbVVWRF9WQ1BVX0NBQ0hFX09GRlNF VDAsIG9mZnNldCA+PiAzKTsKIAlXUkVHMzIobW1VVkRfVkNQVV9DQUNIRV9TSVpFMCwgc2l6ZSk7 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92Nl8wLmMgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZfMC5jCmluZGV4IDBjMDE4MjVhOGI5ZS4u N2M1MTBhZWQ3YTFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRf djZfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92Nl8wLmMKQEAgLTU5 NSw2ICs1OTUsNyBAQCBzdGF0aWMgdm9pZCB1dmRfdjZfMF9tY19yZXN1bWUoc3RydWN0IGFtZGdw dV9kZXZpY2UgKmFkZXYpCiB7CiAJdWludDY0X3Qgb2Zmc2V0OwogCXVpbnQzMl90IHNpemU7CisJ Y29uc3Qgc3RydWN0IGNvbW1vbl9maXJtd2FyZV9oZWFkZXIgKmhkcjsKIAogCS8qIHByb2dyYW1t IG1lbW9yeSBjb250cm9sbGVyIGJpdHMgMC0yNyAqLwogCVdSRUczMihtbVVWRF9MTUlfVkNQVV9D QUNIRV82NEJJVF9CQVJfTE9XLApAQCAtNjAzLDcgKzYwNCw5IEBAIHN0YXRpYyB2b2lkIHV2ZF92 Nl8wX21jX3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJCXVwcGVyXzMyX2Jp dHMoYWRldi0+dXZkLmdwdV9hZGRyKSk7CiAKIAlvZmZzZXQgPSBBTURHUFVfVVZEX0ZJUk1XQVJF X09GRlNFVDsKLQlzaXplID0gQU1ER1BVX0dQVV9QQUdFX0FMSUdOKGFkZXYtPnV2ZC5mdy0+c2l6 ZSArIDQpOworCWhkciA9IChjb25zdCBzdHJ1Y3QgY29tbW9uX2Zpcm13YXJlX2hlYWRlciAqKWFk ZXYtPnV2ZC5mdy0+ZGF0YTsKKwlzaXplID0gQU1ER1BVX0dQVV9QQUdFX0FMSUdOKGxlMzJfdG9f Y3B1KGhkci0+dWNvZGVfc2l6ZV9ieXRlcykgKyA4KSAtCisJICAgICAgIEFNREdQVV9VVkRfRklS TVdBUkVfT0ZGU0VUOwogCVdSRUczMihtbVVWRF9WQ1BVX0NBQ0hFX09GRlNFVDAsIG9mZnNldCA+ PiAzKTsKIAlXUkVHMzIobW1VVkRfVkNQVV9DQUNIRV9TSVpFMCwgc2l6ZSk7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92N18wLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS91dmRfdjdfMC5jCmluZGV4IDdiNzczMzlmZWIxYS4uYjAxNWNmZDUwNjdk IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjdfMC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92N18wLmMKQEAgLTYxNiw4ICs2MTYsMTMg QEAgc3RhdGljIGludCB1dmRfdjdfMF9yZXN1bWUodm9pZCAqaGFuZGxlKQogICovCiBzdGF0aWMg dm9pZCB1dmRfdjdfMF9tY19yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiB7Ci0J dWludDMyX3Qgc2l6ZSA9IEFNREdQVV9HUFVfUEFHRV9BTElHTihhZGV2LT51dmQuZnctPnNpemUg KyA0KTsKKwl1aW50MzJfdCBzaXplOwogCXVpbnQzMl90IG9mZnNldDsKKwljb25zdCBzdHJ1Y3Qg Y29tbW9uX2Zpcm13YXJlX2hlYWRlciAqaGRyOworCisJaGRyID0gKGNvbnN0IHN0cnVjdCBjb21t b25fZmlybXdhcmVfaGVhZGVyICopYWRldi0+dXZkLmZ3LT5kYXRhOworCXNpemUgPSBBTURHUFVf R1BVX1BBR0VfQUxJR04obGUzMl90b19jcHUoaGRyLT51Y29kZV9zaXplX2J5dGVzKSArIDgpIC0K KwkgICAgICAgQU1ER1BVX1VWRF9GSVJNV0FSRV9PRkZTRVQ7CiAKIAlpZiAoYWRldi0+ZmlybXdh cmUubG9hZF90eXBlID09IEFNREdQVV9GV19MT0FEX1BTUCkgewogCQlXUkVHMzJfU09DMTUoVVZE LCAwLCBtbVVWRF9MTUlfVkNQVV9DQUNIRV82NEJJVF9CQVJfTE9XLAotLSAKMi4xNS4wCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxp bmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK