From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom St Denis <tstdenis82-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 3/3] drm/amd/amdgpu: Various tidy ups for gfx6
Date: Thu,  1 Sep 2016 13:44:47 -0400
Message-ID: <20160901174447.13037-4-tom.stdenis@amd.com>
References: <20160901174447.13037-1-tom.stdenis@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: <20160901174447.13037-1-tom.stdenis-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: Tom St Denis <tom.stdenis-5C7GfCeVMHo@public.gmane.org>

VmFyaW91cyB3aGl0ZXNwYWNlIGFuZCBsb2dpY2FsIHNpbXBsaWZpY2F0aW9ucyBmb3IgZ2Z4Ni4K
ClNpZ25lZC1vZmYtYnk6IFRvbSBTdCBEZW5pcyA8dG9tLnN0ZGVuaXNAYW1kLmNvbT4KLS0tCiBk
cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjZfMC5jIHwgNDAgKysrKystLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDM1
IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dm
eF92Nl8wLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjZfMC5jCmluZGV4IDVm
NTA4Yzk2NDk2Zi4uNjNjYTc3OTM3NzE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k
L2FtZGdwdS9nZnhfdjZfMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92
Nl8wLmMKQEAgLTEyMTEsMTEgKzEyMTEsOCBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF9ncHVfaW5p
dChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAkJCQkgU0NfRUFSTFlaX1RJTEVfRklGT19T
SVpFKGFkZXYtPmdmeC5jb25maWcuc2NfZWFybHl6X3RpbGVfZmlmb19zaXplKSkpOwogCiAJV1JF
RzMyKFZHVF9OVU1fSU5TVEFOQ0VTLCAxKTsKLQogCVdSRUczMihDUF9QRVJGTU9OX0NOVEwsIDAp
OwotCiAJV1JFRzMyKFNRX0NPTkZJRywgMCk7Ci0KIAlXUkVHMzIoUEFfU0NfRk9SQ0VfRU9WX01B
WF9DTlRTLCAoRk9SQ0VfRU9WX01BWF9DTEtfQ05UKDQwOTUpIHwKIAkJCQkJICBGT1JDRV9FT1Zf
TUFYX1JFWl9DTlQoMjU1KSkpOwogCkBAIC0xMjQwLDcgKzEyMzcsNiBAQCBzdGF0aWMgdm9pZCBn
ZnhfdjZfMF9ncHVfaW5pdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIAlXUkVHMzIoUEFf
Q0xfRU5IQU5DRSwgQ0xJUF9WVFhfUkVPUkRFUl9FTkEgfCBOVU1fQ0xJUF9TRVEoMykpOwogCiAJ
dWRlbGF5KDUwKTsKLQogfQogCiAKQEAgLTE2NjEsMjEgKzE2NTcsMTQgQEAgc3RhdGljIGludCBn
ZnhfdjZfMF9jcF9nZnhfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiBzdGF0
aWMgdTMyIGdmeF92Nl8wX3JpbmdfZ2V0X3JwdHJfZ2Z4KHN0cnVjdCBhbWRncHVfcmluZyAqcmlu
ZykKIHsKLQl1MzIgcnB0cjsKLQotCXJwdHIgPSByaW5nLT5hZGV2LT53Yi53YltyaW5nLT5ycHRy
X29mZnNdOwotCi0JcmV0dXJuIHJwdHI7CisJcmV0dXJuIHJpbmctPmFkZXYtPndiLndiW3Jpbmct
PnJwdHJfb2Zmc107CiB9CiAKIHN0YXRpYyB1MzIgZ2Z4X3Y2XzBfcmluZ19nZXRfd3B0cl9nZngo
c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2
ID0gcmluZy0+YWRldjsKLQl1MzIgd3B0cjsKIAotCXdwdHIgPSBSUkVHMzIoQ1BfUkIwX1dQVFIp
OwotCi0JcmV0dXJuIHdwdHI7CisJcmV0dXJuIFJSRUczMihDUF9SQjBfV1BUUik7CiB9CiAKIHN0
YXRpYyB2b2lkIGdmeF92Nl8wX3Jpbmdfc2V0X3dwdHJfZ2Z4KHN0cnVjdCBhbWRncHVfcmluZyAq
cmluZykKQEAgLTE2ODgsOSArMTY3Nyw3IEBAIHN0YXRpYyB2b2lkIGdmeF92Nl8wX3Jpbmdfc2V0
X3dwdHJfZ2Z4KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAogc3RhdGljIHUzMiBnZnhfdjZf
MF9yaW5nX2dldF9ycHRyX2NvbXB1dGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewotCXUz
MiBycHRyID0gcmluZy0+YWRldi0+d2Iud2JbcmluZy0+cnB0cl9vZmZzXTsKLQotCXJldHVybiBy
cHRyOworCXJldHVybiByaW5nLT5hZGV2LT53Yi53YltyaW5nLT5ycHRyX29mZnNdOwogfQogCiBz
dGF0aWMgdTMyIGdmeF92Nl8wX3JpbmdfZ2V0X3dwdHJfY29tcHV0ZShzdHJ1Y3QgYW1kZ3B1X3Jp
bmcgKnJpbmcpCkBAIC0xNzcwLDE0ICsxNzU3LDEyIEBAIHN0YXRpYyBpbnQgZ2Z4X3Y2XzBfY3Bf
Y29tcHV0ZV9yZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJcmluZy0+d3B0ciA9
IDA7CiAJV1JFRzMyKENQX1JCMV9XUFRSLCByaW5nLT53cHRyKTsKIAotCiAJcnB0cl9hZGRyID0g
YWRldi0+d2IuZ3B1X2FkZHIgKyAocmluZy0+cnB0cl9vZmZzICogNCk7CiAJV1JFRzMyKENQX1JC
MV9SUFRSX0FERFIsIGxvd2VyXzMyX2JpdHMocnB0cl9hZGRyKSk7CiAJV1JFRzMyKENQX1JCMV9S
UFRSX0FERFJfSEksIHVwcGVyXzMyX2JpdHMocnB0cl9hZGRyKSAmIDB4RkYpOwogCiAJbWRlbGF5
KDEpOwogCVdSRUczMihDUF9SQjFfQ05UTCwgdG1wKTsKLQogCVdSRUczMihDUF9SQjFfQkFTRSwg
cmluZy0+Z3B1X2FkZHIgPj4gOCk7CiAKIAlyaW5nID0gJmFkZXYtPmdmeC5jb21wdXRlX3Jpbmdb
MV07CkBAIC0xNzk3LDcgKzE3ODIsNiBAQCBzdGF0aWMgaW50IGdmeF92Nl8wX2NwX2NvbXB1dGVf
cmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiAJbWRlbGF5KDEpOwogCVdSRUcz
MihDUF9SQjJfQ05UTCwgdG1wKTsKLQogCVdSRUczMihDUF9SQjJfQkFTRSwgcmluZy0+Z3B1X2Fk
ZHIgPj4gOCk7CiAKIAlhZGV2LT5nZnguY29tcHV0ZV9yaW5nWzBdLnJlYWR5ID0gdHJ1ZTsKQEAg
LTE4MjUsMTIgKzE4MDksNyBAQCBzdGF0aWMgdm9pZCBnZnhfdjZfMF9jcF9lbmFibGUoc3RydWN0
IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGJvb2wgZW5hYmxlKQogCiBzdGF0aWMgaW50IGdmeF92Nl8w
X2NwX2xvYWRfbWljcm9jb2RlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewotCWludCBy
OwotCi0JciA9IGdmeF92Nl8wX2NwX2dmeF9sb2FkX21pY3JvY29kZShhZGV2KTsKLQotCXJldHVy
biByOwotCisJcmV0dXJuIGdmeF92Nl8wX2NwX2dmeF9sb2FkX21pY3JvY29kZShhZGV2KTsKIH0K
IAogc3RhdGljIHZvaWQgZ2Z4X3Y2XzBfZW5hYmxlX2d1aV9pZGxlX2ludGVycnVwdChzdHJ1Y3Qg
YW1kZ3B1X2RldmljZSAqYWRldiwKQEAgLTIxNzIsNyArMjE1MSw2IEBAIHN0YXRpYyB2b2lkIGdm
eF92Nl8wX3JsY19zdG9wKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCVdSRUczMihSTENf
Q05UTCwgMCk7CiAKIAlnZnhfdjZfMF9lbmFibGVfZ3VpX2lkbGVfaW50ZXJydXB0KGFkZXYsIGZh
bHNlKTsKLQogCWdmeF92Nl8wX3dhaXRfZm9yX3JsY19zZXJkZXMoYWRldik7CiB9CiAKQEAgLTIy
MjMsMTEgKzIyMDEsOCBAQCBzdGF0aWMgaW50IGdmeF92Nl8wX3JsY19yZXN1bWUoc3RydWN0IGFt
ZGdwdV9kZXZpY2UgKmFkZXYpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJZ2Z4X3Y2XzBfcmxjX3N0
b3AoYWRldik7Ci0KIAlnZnhfdjZfMF9ybGNfcmVzZXQoYWRldik7Ci0KIAlnZnhfdjZfMF9pbml0
X3BnKGFkZXYpOwotCiAJZ2Z4X3Y2XzBfaW5pdF9jZyhhZGV2KTsKIAogCVdSRUczMihSTENfUkxf
QkFTRSwgMCk7CkBAIC0yMjU0LDcgKzIyMjksNiBAQCBzdGF0aWMgaW50IGdmeF92Nl8wX3JsY19y
ZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJV1JFRzMyKFJMQ19VQ09ERV9BRERS
LCAwKTsKIAogCWdmeF92Nl8wX2VuYWJsZV9sYnB3KGFkZXYsIGdmeF92Nl8wX2xicHdfc3VwcG9y
dGVkKGFkZXYpKTsKLQogCWdmeF92Nl8wX3JsY19zdGFydChhZGV2KTsKIAogCXJldHVybiAwOwpA
QCAtMjI3OCw3ICsyMjUyLDYgQEAgc3RhdGljIHZvaWQgZ2Z4X3Y2XzBfZW5hYmxlX2NnY2coc3Ry
dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGJvb2wgZW5hYmxlKQogCQlXUkVHMzIoUkxDX1NFUkRF
U19XUl9DVFJMLCAweDAwYjAwMGZmKTsKIAogCQlnZnhfdjZfMF93YWl0X2Zvcl9ybGNfc2VyZGVz
KGFkZXYpOwotCiAJCWdmeF92Nl8wX3VwZGF0ZV9ybGMoYWRldiwgdG1wKTsKIAogCQlXUkVHMzIo
UkxDX1NFUkRFU19XUl9DVFJMLCAweDAwNzAwMGZmKTsKQEAgLTI5MzEsMTMgKzI5MDQsMTAgQEAg
c3RhdGljIGJvb2wgZ2Z4X3Y2XzBfaXNfaWRsZSh2b2lkICpoYW5kbGUpCiBzdGF0aWMgaW50IGdm
eF92Nl8wX3dhaXRfZm9yX2lkbGUodm9pZCAqaGFuZGxlKQogewogCXVuc2lnbmVkIGk7Ci0JdTMy
IHRtcDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2Rldmlj
ZSAqKWhhbmRsZTsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2LT51c2VjX3RpbWVvdXQ7IGkrKykg
ewotCQl0bXAgPSBSUkVHMzIoR1JCTV9TVEFUVVMpICYgR1JCTV9TVEFUVVNfX0dVSV9BQ1RJVkVf
TUFTSzsKLQotCQlpZiAoIXRtcCkKKwkJaWYgKGdmeF92Nl8wX2lzX2lkbGUoaGFuZGxlKSkKIAkJ
CXJldHVybiAwOwogCQl1ZGVsYXkoMSk7CiAJfQotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1n
ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h
aWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=