From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom St Denis <tstdenis82-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 4/6] drm/amd/amdgpu: Merge get_wptr functions in gfx6
Date: Fri,  2 Sep 2016 08:49:06 -0400
Message-ID: <20160902124908.18360-5-tom.stdenis@amd.com>
References: <20160902124908.18360-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: <20160902124908.18360-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>

U2lnbmVkLW9mZi1ieTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92Nl8wLmMgfCAzMSArKysrKysrKysrKy0tLS0t
LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMjAgZGVs
ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y2
XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92Nl8wLmMKaW5kZXggOGNjNTAy
NWQ4YTRkLi43MzY4NWE0ODE2ZmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k
Z3B1L2dmeF92Nl8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y2XzAu
YwpAQCAtMTY2MCwxMSArMTY2MCwxOCBAQCBzdGF0aWMgdTMyIGdmeF92Nl8wX3JpbmdfZ2V0X3Jw
dHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogCXJldHVybiByaW5nLT5hZGV2LT53Yi53Ylty
aW5nLT5ycHRyX29mZnNdOwogfQogCi1zdGF0aWMgdTMyIGdmeF92Nl8wX3JpbmdfZ2V0X3dwdHJf
Z2Z4KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKK3N0YXRpYyB1MzIgZ2Z4X3Y2XzBfcmluZ19n
ZXRfd3B0cihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZp
Y2UgKmFkZXYgPSByaW5nLT5hZGV2OwogCi0JcmV0dXJuIFJSRUczMihDUF9SQjBfV1BUUik7CisJ
aWYgKHJpbmcgPT0gJmFkZXYtPmdmeC5nZnhfcmluZ1swXSkKKwkJcmV0dXJuIFJSRUczMihDUF9S
QjBfV1BUUik7CisJZWxzZSBpZiAocmluZyA9PSAmYWRldi0+Z2Z4LmNvbXB1dGVfcmluZ1swXSkK
KwkJcmV0dXJuIFJSRUczMihDUF9SQjFfV1BUUik7CisJZWxzZSBpZiAocmluZyA9PSAmYWRldi0+
Z2Z4LmNvbXB1dGVfcmluZ1sxXSkKKwkJcmV0dXJuIFJSRUczMihDUF9SQjJfV1BUUik7CisJZWxz
ZQorCQlCVUcoKTsKIH0KIAogc3RhdGljIHZvaWQgZ2Z4X3Y2XzBfcmluZ19zZXRfd3B0cl9nZngo
c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQpAQCAtMTY3NSwyMiArMTY4Miw2IEBAIHN0YXRpYyB2
b2lkIGdmeF92Nl8wX3Jpbmdfc2V0X3dwdHJfZ2Z4KHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykK
IAkodm9pZClSUkVHMzIoQ1BfUkIwX1dQVFIpOwogfQogCi1zdGF0aWMgdTMyIGdmeF92Nl8wX3Jp
bmdfZ2V0X3dwdHJfY29tcHV0ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCi17Ci0Jc3RydWN0
IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5nLT5hZGV2OwotCXUzMiB3cHRyOwotCi0JaWYgKHJp
bmcgPT0gJmFkZXYtPmdmeC5jb21wdXRlX3JpbmdbMF0pIHsKLQkJd3B0ciA9IFJSRUczMihDUF9S
QjFfV1BUUik7Ci0JfSBlbHNlIGlmIChyaW5nID09ICZhZGV2LT5nZnguY29tcHV0ZV9yaW5nWzFd
KSB7Ci0JCXdwdHIgPSBSUkVHMzIoQ1BfUkIyX1dQVFIpOwotCX0gZWxzZSB7Ci0JCUJVRygpOwot
CX0KLQotCXJldHVybiB3cHRyOwotfQotCiBzdGF0aWMgdm9pZCBnZnhfdjZfMF9yaW5nX3NldF93
cHRyX2NvbXB1dGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVf
ZGV2aWNlICphZGV2ID0gcmluZy0+YWRldjsKQEAgLTMxNDgsNyArMzEzOSw3IEBAIGNvbnN0IHN0
cnVjdCBhbWRfaXBfZnVuY3MgZ2Z4X3Y2XzBfaXBfZnVuY3MgPSB7CiAKIHN0YXRpYyBjb25zdCBz
dHJ1Y3QgYW1kZ3B1X3JpbmdfZnVuY3MgZ2Z4X3Y2XzBfcmluZ19mdW5jc19nZnggPSB7CiAJLmdl
dF9ycHRyID0gZ2Z4X3Y2XzBfcmluZ19nZXRfcnB0ciwKLQkuZ2V0X3dwdHIgPSBnZnhfdjZfMF9y
aW5nX2dldF93cHRyX2dmeCwKKwkuZ2V0X3dwdHIgPSBnZnhfdjZfMF9yaW5nX2dldF93cHRyLAog
CS5zZXRfd3B0ciA9IGdmeF92Nl8wX3Jpbmdfc2V0X3dwdHJfZ2Z4LAogCS5wYXJzZV9jcyA9IE5V
TEwsCiAJLmVtaXRfaWIgPSBnZnhfdjZfMF9yaW5nX2VtaXRfaWJfZ2Z4LApAQCAtMzE2NSw3ICsz
MTU2LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyBnZnhfdjZfMF9y
aW5nX2Z1bmNzX2dmeCA9IHsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5j
cyBnZnhfdjZfMF9yaW5nX2Z1bmNzX2NvbXB1dGUgPSB7CiAJLmdldF9ycHRyID0gZ2Z4X3Y2XzBf
cmluZ19nZXRfcnB0ciwKLQkuZ2V0X3dwdHIgPSBnZnhfdjZfMF9yaW5nX2dldF93cHRyX2NvbXB1
dGUsCisJLmdldF93cHRyID0gZ2Z4X3Y2XzBfcmluZ19nZXRfd3B0ciwKIAkuc2V0X3dwdHIgPSBn
ZnhfdjZfMF9yaW5nX3NldF93cHRyX2NvbXB1dGUsCiAJLnBhcnNlX2NzID0gTlVMTCwKIAkuZW1p
dF9pYiA9IGdmeF92Nl8wX3JpbmdfZW1pdF9pYl9jb21wdXRlLAotLSAKMi45LjMKCl9fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBs
aXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0
b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=