From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom St Denis <tstdenis82-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 1/7] drm/amd/amdgpu: Tidy up SI DMA code
Date: Tue,  6 Sep 2016 12:18:38 -0400
Message-ID: <20160906161844.21370-2-tom.stdenis@amd.com>
References: <20160906161844.21370-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: <20160906161844.21370-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
aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NpX2RtYS5jIHwgMzUgKysrKystLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDMwIGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NpX2Rt
YS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2lfZG1hLmMKaW5kZXggMzc3ZjRhZTll
Nzc3Li4yYWJkYWE2ODE3OTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1
L3NpX2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3NpX2RtYS5jCkBAIC0z
OSwxNiArMzksMTEgQEAgc3RhdGljIHZvaWQgc2lfZG1hX3NldF9pcnFfZnVuY3Moc3RydWN0IGFt
ZGdwdV9kZXZpY2UgKmFkZXYpOwogCiBzdGF0aWMgdWludDMyX3Qgc2lfZG1hX3JpbmdfZ2V0X3Jw
dHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewotCXUzMiBycHRyOwotCi0JcnB0ciA9IHJp
bmctPmFkZXYtPndiLndiW3JpbmctPnJwdHJfb2Zmcy80XTsKLQotCXJldHVybiBycHRyOworCXJl
dHVybiByaW5nLT5hZGV2LT53Yi53YltyaW5nLT5ycHRyX29mZnM+PjJdOwogfQogCiBzdGF0aWMg
dWludDMyX3Qgc2lfZG1hX3JpbmdfZ2V0X3dwdHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQog
ewotCiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5nLT5hZGV2OwogCXUzMiBtZSA9
IChyaW5nID09ICZhZGV2LT5zZG1hLmluc3RhbmNlWzBdLnJpbmcpID8gMCA6IDE7CiAKQEAgLTE4
OCw3ICsxODMsNiBAQCBzdGF0aWMgaW50IHNpX2RtYV9zdGFydChzdHJ1Y3QgYW1kZ3B1X2Rldmlj
ZSAqYWRldikKIAogCQlyaW5nLT53cHRyID0gMDsKIAkJV1JFRzMyKERNQV9SQl9XUFRSICsgc2Rt
YV9vZmZzZXRzW2ldLCByaW5nLT53cHRyIDw8IDIpOwotCiAJCVdSRUczMihETUFfUkJfQ05UTCAr
IHNkbWFfb2Zmc2V0c1tpXSwgcmJfY250bCB8IERNQV9SQl9FTkFCTEUpOwogCiAJCXJpbmctPnJl
YWR5ID0gdHJ1ZTsKQEAgLTQ3NiwxMSArNDcwLDEwIEBAIHN0YXRpYyB2b2lkIHNpX2RtYV9yaW5n
X2VtaXRfdm1fZmx1c2goc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQkJCSAgICAgIHVuc2ln
bmVkIHZtX2lkLCB1aW50NjRfdCBwZF9hZGRyKQogewogCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcs
IERNQV9QQUNLRVQoRE1BX1BBQ0tFVF9TUkJNX1dSSVRFLCAwLCAwLCAwLCAwKSk7Ci0JaWYgKHZt
X2lkIDwgOCkgeworCWlmICh2bV9pZCA8IDgpCiAJCWFtZGdwdV9yaW5nX3dyaXRlKHJpbmcsICgw
eGYgPDwgMTYpIHwgKFZNX0NPTlRFWFQwX1BBR0VfVEFCTEVfQkFTRV9BRERSICsgdm1faWQpKTsK
LQl9IGVsc2UgeworCWVsc2UKIAkJYW1kZ3B1X3Jpbmdfd3JpdGUocmluZywgKDB4ZiA8PCAxNikg
fCAoVk1fQ09OVEVYVDhfUEFHRV9UQUJMRV9CQVNFX0FERFIgKyAodm1faWQgLSA4KSkpOwotCX0K
IAlhbWRncHVfcmluZ193cml0ZShyaW5nLCBwZF9hZGRyID4+IDEyKTsKIAogCS8qIGJpdHMgMC03
IGFyZSB0aGUgVk0gY29udGV4dHMwLTcgKi8KQEAgLTU1OCwxNCArNTUxLDkgQEAgc3RhdGljIGlu
dCBzaV9kbWFfc3dfZmluaSh2b2lkICpoYW5kbGUpCiAKIHN0YXRpYyBpbnQgc2lfZG1hX2h3X2lu
aXQodm9pZCAqaGFuZGxlKQogewotCWludCByOwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2
ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxlOwogCi0JciA9IHNpX2RtYV9zdGFydChh
ZGV2KTsKLQlpZiAocikKLQkJcmV0dXJuIHI7Ci0KLQlyZXR1cm4gcjsKKwlyZXR1cm4gc2lfZG1h
X3N0YXJ0KGFkZXYpOwogfQogCiBzdGF0aWMgaW50IHNpX2RtYV9od19maW5pKHZvaWQgKmhhbmRs
ZSkKQEAgLTYwNSwxMyArNTkzLDEwIEBAIHN0YXRpYyBib29sIHNpX2RtYV9pc19pZGxlKHZvaWQg
KmhhbmRsZSkKIHN0YXRpYyBpbnQgc2lfZG1hX3dhaXRfZm9yX2lkbGUodm9pZCAqaGFuZGxlKQog
ewogCXVuc2lnbmVkIGk7Ci0JdTMyIHRtcDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9
IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAogCWZvciAoaSA9IDA7IGkgPCBhZGV2
LT51c2VjX3RpbWVvdXQ7IGkrKykgewotCQl0bXAgPSBSUkVHMzIoU1JCTV9TVEFUVVMyKSAmIChE
TUFfQlVTWV9NQVNLIHwgRE1BMV9CVVNZX01BU0spOwotCi0JCWlmICghdG1wKQorCQlpZiAoc2lf
ZG1hX2lzX2lkbGUoaGFuZGxlKSkKIAkJCXJldHVybiAwOwogCQl1ZGVsYXkoMSk7CiAJfQpAQCAt
Njc0LDExICs2NTksNiBAQCBzdGF0aWMgaW50IHNpX2RtYV9wcm9jZXNzX3RyYXBfaXJxKHN0cnVj
dCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCSAgICAgIHN0cnVjdCBhbWRncHVfaXJxX3NyYyAq
c291cmNlLAogCQkJCSAgICAgIHN0cnVjdCBhbWRncHVfaXZfZW50cnkgKmVudHJ5KQogewotCXU4
IGluc3RhbmNlX2lkLCBxdWV1ZV9pZDsKLQotCWluc3RhbmNlX2lkID0gKGVudHJ5LT5yaW5nX2lk
ICYgMHgzKSA+PiAwOwotCXF1ZXVlX2lkID0gKGVudHJ5LT5yaW5nX2lkICYgMHhjKSA+PiAyOwot
CiAJYW1kZ3B1X2ZlbmNlX3Byb2Nlc3MoJmFkZXYtPnNkbWEuaW5zdGFuY2VbMF0ucmluZyk7CiAK
IAlyZXR1cm4gMDsKQEAgLTY4OCwxMSArNjY4LDYgQEAgc3RhdGljIGludCBzaV9kbWFfcHJvY2Vz
c190cmFwX2lycV8xKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCQkJCSAgICAgIHN0cnVj
dCBhbWRncHVfaXJxX3NyYyAqc291cmNlLAogCQkJCSAgICAgIHN0cnVjdCBhbWRncHVfaXZfZW50
cnkgKmVudHJ5KQogewotCXU4IGluc3RhbmNlX2lkLCBxdWV1ZV9pZDsKLQotCWluc3RhbmNlX2lk
ID0gKGVudHJ5LT5yaW5nX2lkICYgMHgzKSA+PiAwOwotCXF1ZXVlX2lkID0gKGVudHJ5LT5yaW5n
X2lkICYgMHhjKSA+PiAyOwotCiAJYW1kZ3B1X2ZlbmNlX3Byb2Nlc3MoJmFkZXYtPnNkbWEuaW5z
dGFuY2VbMV0ucmluZyk7CiAKIAlyZXR1cm4gMDsKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQt
Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t
YWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK