From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom St Denis Subject: [PATCH 5/6] drm/amd/amdgpu: Merge get_wptr functions in gfx7 Date: Fri, 2 Sep 2016 08:49:07 -0400 Message-ID: <20160902124908.18360-6-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: In-Reply-To: <20160902124908.18360-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92N18wLmMgfCAxNyArKysrKysrLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92N18wLmMKaW5kZXggODRhZDEzZWMzNzcxLi45MjZmZDU3 MGYwZWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92N18wLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ2Z4X3Y3XzAuYwpAQCAtMjQ0OCwxMSAr MjQ0OCwxNCBAQCBzdGF0aWMgdTMyIGdmeF92N18wX3JpbmdfZ2V0X3JwdHIoc3RydWN0IGFtZGdw dV9yaW5nICpyaW5nKQogCXJldHVybiByaW5nLT5hZGV2LT53Yi53YltyaW5nLT5ycHRyX29mZnNd OwogfQogCi1zdGF0aWMgdTMyIGdmeF92N18wX3JpbmdfZ2V0X3dwdHJfZ2Z4KHN0cnVjdCBhbWRn cHVfcmluZyAqcmluZykKK3N0YXRpYyB1MzIgZ2Z4X3Y3XzBfcmluZ19nZXRfd3B0cihzdHJ1Y3Qg YW1kZ3B1X3JpbmcgKnJpbmcpCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5n LT5hZGV2OwogCi0JcmV0dXJuIFJSRUczMihtbUNQX1JCMF9XUFRSKTsKKwlpZiAocmluZyA9PSAm YWRldi0+Z2Z4LmdmeF9yaW5nWzBdKQorCQlyZXR1cm4gUlJFRzMyKG1tQ1BfUkIwX1dQVFIpOwor CWVsc2UKKwkJcmV0dXJuIHJpbmctPmFkZXYtPndiLndiW3JpbmctPndwdHJfb2Zmc107CiB9CiAK IHN0YXRpYyB2b2lkIGdmeF92N18wX3Jpbmdfc2V0X3dwdHJfZ2Z4KHN0cnVjdCBhbWRncHVfcmlu ZyAqcmluZykKQEAgLTI0NjMsMTIgKzI0NjYsNiBAQCBzdGF0aWMgdm9pZCBnZnhfdjdfMF9yaW5n X3NldF93cHRyX2dmeChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiAJKHZvaWQpUlJFRzMyKG1t Q1BfUkIwX1dQVFIpOwogfQogCi1zdGF0aWMgdTMyIGdmeF92N18wX3JpbmdfZ2V0X3dwdHJfY29t cHV0ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCi17Ci0JLyogWFhYIGNoZWNrIGlmIHN3YXBw aW5nIGlzIG5lY2Vzc2FyeSBvbiBCRSAqLwotCXJldHVybiByaW5nLT5hZGV2LT53Yi53YltyaW5n LT53cHRyX29mZnNdOwotfQotCiBzdGF0aWMgdm9pZCBnZnhfdjdfMF9yaW5nX3NldF93cHRyX2Nv bXB1dGUoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2ID0gcmluZy0+YWRldjsKQEAgLTQ5MTYsNyArNDkxMyw3IEBAIGNvbnN0IHN0cnVjdCBh bWRfaXBfZnVuY3MgZ2Z4X3Y3XzBfaXBfZnVuY3MgPSB7CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg YW1kZ3B1X3JpbmdfZnVuY3MgZ2Z4X3Y3XzBfcmluZ19mdW5jc19nZnggPSB7CiAJLmdldF9ycHRy ID0gZ2Z4X3Y3XzBfcmluZ19nZXRfcnB0ciwKLQkuZ2V0X3dwdHIgPSBnZnhfdjdfMF9yaW5nX2dl dF93cHRyX2dmeCwKKwkuZ2V0X3dwdHIgPSBnZnhfdjdfMF9yaW5nX2dldF93cHRyLAogCS5zZXRf d3B0ciA9IGdmeF92N18wX3Jpbmdfc2V0X3dwdHJfZ2Z4LAogCS5wYXJzZV9jcyA9IE5VTEwsCiAJ LmVtaXRfaWIgPSBnZnhfdjdfMF9yaW5nX2VtaXRfaWJfZ2Z4LApAQCAtNDkzNCw3ICs0OTMxLDcg QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyBnZnhfdjdfMF9yaW5nX2Z1 bmNzX2dmeCA9IHsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyBnZnhf djdfMF9yaW5nX2Z1bmNzX2NvbXB1dGUgPSB7CiAJLmdldF9ycHRyID0gZ2Z4X3Y3XzBfcmluZ19n ZXRfcnB0ciwKLQkuZ2V0X3dwdHIgPSBnZnhfdjdfMF9yaW5nX2dldF93cHRyX2NvbXB1dGUsCisJ LmdldF93cHRyID0gZ2Z4X3Y3XzBfcmluZ19nZXRfd3B0ciwKIAkuc2V0X3dwdHIgPSBnZnhfdjdf MF9yaW5nX3NldF93cHRyX2NvbXB1dGUsCiAJLnBhcnNlX2NzID0gTlVMTCwKIAkuZW1pdF9pYiA9 IGdmeF92N18wX3JpbmdfZW1pdF9pYl9jb21wdXRlLAotLSAKMi45LjMKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFt ZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=