From: Alex Deucher Subject: [PATCH 3/4] drm/amdgpu/sdma4: drop allocation of poll_mem_offs Date: Fri, 28 Jul 2017 16:34:07 -0400 Message-ID: <1501274048-4375-3-git-send-email-alexander.deucher@amd.com> References: <1501274048-4375-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1501274048-4375-1-git-send-email-alexander.deucher-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: Alex Deucher , Frank Min V2UgYWxyZWFkeSBhbGxvY2F0ZSB0aGlzIGFzIHBhcnQgb2YgdGhlIHJpbmcgc3RydWN0dXJlLAp1 c2UgdGhhdCBpbnN0ZWFkLgoKQ2M6IEZyYW5rIE1pbiA8RnJhbmsuTWluQGFtZC5jb20+ClJldmll d2VkLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+ClNpZ25l ZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAgICB8ICAxIC0KIGRyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5jIHwgNDUgKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggOTUzM2FlZC4uMjdjY2Rk ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTEyMDUsNyArMTIwNSw2IEBA IHN0cnVjdCBhbWRncHVfc2RtYV9pbnN0YW5jZSB7CiAKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcJcmlu ZzsKIAlib29sCQkJYnVyc3Rfbm9wOwotCXVpbnQzMl90CQlwb2xsX21lbV9vZmZzOwogfTsKIAog c3RydWN0IGFtZGdwdV9zZG1hIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L3NkbWFfdjRfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92NF8wLmMK aW5kZXggYzc2NzI3Yi4uODViODU2MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvc2RtYV92NF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92 NF8wLmMKQEAgLTI4Nyw4ICsyODcsNiBAQCBzdGF0aWMgdWludDY0X3Qgc2RtYV92NF8wX3Jpbmdf Z2V0X3dwdHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogICovCiBzdGF0aWMgdm9pZCBzZG1h X3Y0XzBfcmluZ19zZXRfd3B0cihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiB7Ci0JaW50IGk7 Ci0JdTMyIG9mZnNldDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFkZXY7 CiAKIAlEUk1fREVCVUcoIlNldHRpbmcgd3JpdGUgcG9pbnRlclxuIik7CkBAIC0zMDYsMTYgKzMw NCw2IEBAIHN0YXRpYyB2b2lkIHNkbWFfdjRfMF9yaW5nX3NldF93cHRyKHN0cnVjdCBhbWRncHVf cmluZyAqcmluZykKIAkJV1JJVEVfT05DRSgqd2IsIChyaW5nLT53cHRyIDw8IDIpKTsKIAkJRFJN X0RFQlVHKCJjYWxsaW5nIFdET09SQkVMTDY0KDB4JTA4eCwgMHglMDE2bGx4KVxuIiwKIAkJCQly aW5nLT5kb29yYmVsbF9pbmRleCwgcmluZy0+d3B0ciA8PCAyKTsKLQotCQlpZiAoYW1kZ3B1X3Ny aW92X3ZmKGFkZXYpKSB7Ci0JCQlmb3IgKGkgPSAwOyBpIDwgYWRldi0+c2RtYS5udW1faW5zdGFu Y2VzOyBpKyspIHsKLQkJCQlpZiAoJmFkZXYtPnNkbWEuaW5zdGFuY2VbaV0ucmluZyA9PSByaW5n KSB7Ci0JCQkJCW9mZnNldCA9IGFkZXYtPnNkbWEuaW5zdGFuY2VbaV0ucG9sbF9tZW1fb2ZmczsK LQkJCQkJYXRvbWljNjRfc2V0KChhdG9taWM2NF90ICopJmFkZXYtPndiLndiW29mZnNldF0sCi0J CQkJCQkgICAgIChyaW5nLT53cHRyIDw8IDIpKTsKLQkJCQl9Ci0JCQl9Ci0JCX0KIAkJV0RPT1JC RUxMNjQocmluZy0+ZG9vcmJlbGxfaW5kZXgsIHJpbmctPndwdHIgPDwgMik7CiAJfSBlbHNlIHsK IAkJaW50IG1lID0gKHJpbmcgPT0gJnJpbmctPmFkZXYtPnNkbWEuaW5zdGFuY2VbMF0ucmluZykg PyAwIDogMTsKQEAgLTU4NiwxMiArNTc0LDEzIEBAIHN0YXRpYyB2b2lkIHNkbWFfdjRfMF9lbmFi bGUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIGJvb2wgZW5hYmxlKQogc3RhdGljIGludCBz ZG1hX3Y0XzBfZ2Z4X3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKIHsKIAlzdHJ1 Y3QgYW1kZ3B1X3JpbmcgKnJpbmc7Ci0JdTMyIHJiX2NudGwsIGliX2NudGwsIHdwdHJfcG9sbF9h ZGRyX2xvLCB3cHRyX3BvbGxfYWRkcl9oaSwgd3B0cl9wb2xsX2NudGw7CisJdTMyIHJiX2NudGws IGliX2NudGwsIHdwdHJfcG9sbF9jbnRsOwogCXUzMiByYl9idWZzejsKLQl1MzIgd2Jfb2Zmc2V0 LCBwb2xsX29mZnNldDsKKwl1MzIgd2Jfb2Zmc2V0OwogCXUzMiBkb29yYmVsbDsKIAl1MzIgZG9v cmJlbGxfb2Zmc2V0OwogCXUzMiB0ZW1wOworCXU2NCB3cHRyX2dwdV9hZGRyOwogCWludCBpLCBy OwogCiAJZm9yIChpID0gMDsgaSA8IGFkZXYtPnNkbWEubnVtX2luc3RhbmNlczsgaSsrKSB7CkBA IC03MDIsMTcgKzY5MSwxNCBAQCBzdGF0aWMgaW50IHNkbWFfdjRfMF9nZnhfcmVzdW1lKHN0cnVj dCBhbWRncHVfZGV2aWNlICphZGV2KQogCQkJYW1kZ3B1X3R0bV9zZXRfYWN0aXZlX3ZyYW1fc2l6 ZShhZGV2LCBhZGV2LT5tYy5yZWFsX3ZyYW1fc2l6ZSk7CiAKIAkJaWYgKGFtZGdwdV9zcmlvdl92 ZihhZGV2KSkgewotCQkJcG9sbF9vZmZzZXQgPSBhZGV2LT5zZG1hLmluc3RhbmNlW2ldLnBvbGxf bWVtX29mZnMgKiA0OwotCisJCQl3cHRyX2dwdV9hZGRyID0gYWRldi0+d2IuZ3B1X2FkZHIgKyAo cmluZy0+d3B0cl9vZmZzICogNCk7CiAJCQl3cHRyX3BvbGxfY250bCA9IFJSRUczMihzZG1hX3Y0 XzBfZ2V0X3JlZ19vZmZzZXQoaSwgbW1TRE1BMF9HRlhfUkJfV1BUUl9QT0xMX0NOVEwpKTsKLQkJ CXdwdHJfcG9sbF9hZGRyX2xvID0gUlJFRzMyKHNkbWFfdjRfMF9nZXRfcmVnX29mZnNldChpLCBt bVNETUEwX0dGWF9SQl9XUFRSX1BPTExfQUREUl9MTykpOwotCQkJd3B0cl9wb2xsX2FkZHJfbG8g PSBSRUdfU0VUX0ZJRUxEKHdwdHJfcG9sbF9hZGRyX2xvLCBTRE1BMF9HRlhfUkJfV1BUUl9QT0xM X0FERFJfTE8sIEFERFIsCi0JCQkJCQkJCWxvd2VyXzMyX2JpdHMoYWRldi0+d2IuZ3B1X2FkZHIg KyBwb2xsX29mZnNldCkgPj4gMik7Ci0JCQl3cHRyX3BvbGxfYWRkcl9oaSA9IHVwcGVyXzMyX2Jp dHMoYWRldi0+d2IuZ3B1X2FkZHIgKyBwb2xsX29mZnNldCk7CiAJCQl3cHRyX3BvbGxfY250bCA9 IFJFR19TRVRfRklFTEQod3B0cl9wb2xsX2NudGwsIFNETUEwX0dGWF9SQl9XUFRSX1BPTExfQ05U TCwgRjMyX1BPTExfRU5BQkxFLCAxKTsKIAotCQkJV1JFRzMyKHNkbWFfdjRfMF9nZXRfcmVnX29m ZnNldChpLCBtbVNETUEwX0dGWF9SQl9XUFRSX1BPTExfQUREUl9MTyksIHdwdHJfcG9sbF9hZGRy X2xvKTsKLQkJCVdSRUczMihzZG1hX3Y0XzBfZ2V0X3JlZ19vZmZzZXQoaSwgbW1TRE1BMF9HRlhf UkJfV1BUUl9QT0xMX0FERFJfSEkpLCB3cHRyX3BvbGxfYWRkcl9oaSk7CisJCQlXUkVHMzIoc2Rt YV92NF8wX2dldF9yZWdfb2Zmc2V0KGksIG1tU0RNQTBfR0ZYX1JCX1dQVFJfUE9MTF9BRERSX0xP KSwKKwkJCSAgICAgICBsb3dlcl8zMl9iaXRzKHdwdHJfZ3B1X2FkZHIpKTsKKwkJCVdSRUczMihz ZG1hX3Y0XzBfZ2V0X3JlZ19vZmZzZXQoaSwgbW1TRE1BMF9HRlhfUkJfV1BUUl9QT0xMX0FERFJf SEkpLAorCQkJICAgICAgIHVwcGVyXzMyX2JpdHMod3B0cl9ncHVfYWRkcikpOwogCQkJV1JFRzMy KHNkbWFfdjRfMF9nZXRfcmVnX29mZnNldChpLCBtbVNETUEwX0dGWF9SQl9XUFRSX1BPTExfQ05U TCksIHdwdHJfcG9sbF9jbnRsKTsKIAkJfQogCX0KQEAgLTEyNzUsMTUgKzEyNjEsNiBAQCBzdGF0 aWMgaW50IHNkbWFfdjRfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAkJCQkgICAgIChpID09IDAp ID8KIAkJCQkgICAgIEFNREdQVV9TRE1BX0lSUV9UUkFQMCA6CiAJCQkJICAgICBBTURHUFVfU0RN QV9JUlFfVFJBUDEpOwotCi0JCWlmIChhbWRncHVfc3Jpb3ZfdmYoYWRldikpIHsKLQkJCXIgPSBh bWRncHVfd2JfZ2V0KGFkZXYsCi0JCQkJCSAgJmFkZXYtPnNkbWEuaW5zdGFuY2VbaV0ucG9sbF9t ZW1fb2Zmcyk7Ci0JCQlpZiAocikgewotCQkJCWRldl9lcnIoYWRldi0+ZGV2LCAiKCVkKSBmYWls ZWQgdG8gYWxsb2NhdGUgU0RNQSBwb2xsIG1lbSB3Yi5cbiIsIHIpOwotCQkJCXJldHVybiByOwot CQkJfQotCQl9CiAJCWlmIChyKQogCQkJcmV0dXJuIHI7CiAJfQpAQCAtMTI5NiwxMyArMTI3Myw5 IEBAIHN0YXRpYyBpbnQgc2RtYV92NF8wX3N3X2Zpbmkodm9pZCAqaGFuZGxlKQogCXN0cnVjdCBh bWRncHVfZGV2aWNlICphZGV2ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopaGFuZGxlOwogCWlu dCBpOwogCi0JZm9yIChpID0gMDsgaSA8IGFkZXYtPnNkbWEubnVtX2luc3RhbmNlczsgaSsrKSB7 CisJZm9yIChpID0gMDsgaSA8IGFkZXYtPnNkbWEubnVtX2luc3RhbmNlczsgaSsrKQogCQlhbWRn cHVfcmluZ19maW5pKCZhZGV2LT5zZG1hLmluc3RhbmNlW2ldLnJpbmcpOwogCi0JCWlmIChhbWRn cHVfc3Jpb3ZfdmYoYWRldikpCi0JCQlhbWRncHVfd2JfZnJlZShhZGV2LAotCQkJCSAgICAgICBh ZGV2LT5zZG1hLmluc3RhbmNlW2ldLnBvbGxfbWVtX29mZnMpOwotCX0KIAlyZXR1cm4gMDsKIH0K IAotLSAKMi41LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=