From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom St Denis Subject: [PATCH 6/6] drm/amd/amdgpu: Merge get_wptr functions in gfx8 Date: Fri, 2 Sep 2016 08:49:08 -0400 Message-ID: <20160902124908.18360-7-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 aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgfCAxNSArKysrKy0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCmluZGV4IDAyMDU2NzYyZWEwNi4uZDhiMTc3NDVi YzE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nZnhfdjhfMC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dmeF92OF8wLmMKQEAgLTU4NDAsMTIgKzU4 NDAsMTIgQEAgc3RhdGljIHUzMiBnZnhfdjhfMF9yaW5nX2dldF9ycHRyKHN0cnVjdCBhbWRncHVf cmluZyAqcmluZykKIAlyZXR1cm4gcmluZy0+YWRldi0+d2Iud2JbcmluZy0+cnB0cl9vZmZzXTsK IH0KIAotc3RhdGljIHUzMiBnZnhfdjhfMF9yaW5nX2dldF93cHRyX2dmeChzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcpCitzdGF0aWMgdTMyIGdmeF92OF8wX3JpbmdfZ2V0X3dwdHIoc3RydWN0IGFt ZGdwdV9yaW5nICpyaW5nKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gcmluZy0+ YWRldjsKIAotCWlmIChyaW5nLT51c2VfZG9vcmJlbGwpCi0JCS8qIFhYWCBjaGVjayBpZiBzd2Fw cGluZyBpcyBuZWNlc3Nhcnkgb24gQkUgKi8KKwlpZiAocmluZy0+dXNlX2Rvb3JiZWxsIHx8CisJ ICAgIHJpbmcgIT0gJmFkZXYtPmdmeC5nZnhfcmluZ1swXSkKIAkJcmV0dXJuIHJpbmctPmFkZXYt PndiLndiW3JpbmctPndwdHJfb2Zmc107CiAJZWxzZQogCQlyZXR1cm4gUlJFRzMyKG1tQ1BfUkIw X1dQVFIpOwpAQCAtNjA1MSwxMSArNjA1MSw2IEBAIHN0YXRpYyB2b2lkIGdmeF92OF8wX3Jpbmdf ZW1pdF92bV9mbHVzaChzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcsCiAJfQogfQogCi1zdGF0aWMg dTMyIGdmeF92OF8wX3JpbmdfZ2V0X3dwdHJfY29tcHV0ZShzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJp bmcpCi17Ci0JcmV0dXJuIHJpbmctPmFkZXYtPndiLndiW3JpbmctPndwdHJfb2Zmc107Ci19Ci0K IHN0YXRpYyB2b2lkIGdmeF92OF8wX3Jpbmdfc2V0X3dwdHJfY29tcHV0ZShzdHJ1Y3QgYW1kZ3B1 X3JpbmcgKnJpbmcpCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSByaW5nLT5hZGV2 OwpAQCAtNjI1OSw3ICs2MjU0LDcgQEAgY29uc3Qgc3RydWN0IGFtZF9pcF9mdW5jcyBnZnhfdjhf MF9pcF9mdW5jcyA9IHsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBhbWRncHVfcmluZ19mdW5jcyBn ZnhfdjhfMF9yaW5nX2Z1bmNzX2dmeCA9IHsKIAkuZ2V0X3JwdHIgPSBnZnhfdjhfMF9yaW5nX2dl dF9ycHRyLAotCS5nZXRfd3B0ciA9IGdmeF92OF8wX3JpbmdfZ2V0X3dwdHJfZ2Z4LAorCS5nZXRf d3B0ciA9IGdmeF92OF8wX3JpbmdfZ2V0X3dwdHIsCiAJLnNldF93cHRyID0gZ2Z4X3Y4XzBfcmlu Z19zZXRfd3B0cl9nZngsCiAJLnBhcnNlX2NzID0gTlVMTCwKIAkuZW1pdF9pYiA9IGdmeF92OF8w X3JpbmdfZW1pdF9pYl9nZngsCkBAIC02Mjc4LDcgKzYyNzMsNyBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IGFtZGdwdV9yaW5nX2Z1bmNzIGdmeF92OF8wX3JpbmdfZnVuY3NfZ2Z4ID0gewogCiBzdGF0 aWMgY29uc3Qgc3RydWN0IGFtZGdwdV9yaW5nX2Z1bmNzIGdmeF92OF8wX3JpbmdfZnVuY3NfY29t cHV0ZSA9IHsKIAkuZ2V0X3JwdHIgPSBnZnhfdjhfMF9yaW5nX2dldF9ycHRyLAotCS5nZXRfd3B0 ciA9IGdmeF92OF8wX3JpbmdfZ2V0X3dwdHJfY29tcHV0ZSwKKwkuZ2V0X3dwdHIgPSBnZnhfdjhf MF9yaW5nX2dldF93cHRyLAogCS5zZXRfd3B0ciA9IGdmeF92OF8wX3Jpbmdfc2V0X3dwdHJfY29t cHV0ZSwKIAkucGFyc2VfY3MgPSBOVUxMLAogCS5lbWl0X2liID0gZ2Z4X3Y4XzBfcmluZ19lbWl0 X2liX2NvbXB1dGUsCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9h bWQtZ2Z4Cg==