From: Alex Deucher Subject: [PATCH 4/5] drm/amdgpu/sdma4: drop allocation of poll_mem_offs Date: Thu, 27 Jul 2017 15:46:04 -0400 Message-ID: <1501184765-26699-4-git-send-email-alexander.deucher@amd.com> References: <1501184765-26699-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: <1501184765-26699-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+ClNpZ25l ZC1vZmYtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAgICB8ICAxIC0KIGRyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L3NkbWFfdjRfMC5jIHwgNDUgKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggODlmN2I0Zi4uNWY4ZDJl OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTEyMDksNyArMTIwOSw2IEBA IHN0cnVjdCBhbWRncHVfc2RtYV9pbnN0YW5jZSB7CiAKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcJcmlu ZzsKIAlib29sCQkJYnVyc3Rfbm9wOwotCXVpbnQzMl90CQlwb2xsX21lbV9vZmZzOwogfTsKIAog c3RydWN0IGFtZGdwdV9zZG1hIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L3NkbWFfdjRfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92NF8wLmMK aW5kZXggM2ZmZGY4OC4uN2E4ODI2NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvc2RtYV92NF8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvc2RtYV92 NF8wLmMKQEAgLTI4Nyw4ICsyODcsNiBAQCBzdGF0aWMgdWludDY0X3Qgc2RtYV92NF8wX3Jpbmdf Z2V0X3dwdHIoc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nKQogICovCiBzdGF0aWMgdm9pZCBzZG1h X3Y0XzBfcmluZ19zZXRfd3B0cihzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcpCiB7Ci0JaW50IGk7 Ci0JdTMyIG9mZnNldDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHJpbmctPmFkZXY7 CiAKIAlEUk1fREVCVUcoIlNldHRpbmcgd3JpdGUgcG9pbnRlclxuIik7CkBAIC0zMDUsMTYgKzMw Myw2IEBAIHN0YXRpYyB2b2lkIHNkbWFfdjRfMF9yaW5nX3NldF93cHRyKHN0cnVjdCBhbWRncHVf cmluZyAqcmluZykKIAkJCSAgICAgKHJpbmctPndwdHIgPDwgMikpOwogCQlEUk1fREVCVUcoImNh bGxpbmcgV0RPT1JCRUxMNjQoMHglMDh4LCAweCUwMTZsbHgpXG4iLAogCQkJCXJpbmctPmRvb3Ji ZWxsX2luZGV4LCByaW5nLT53cHRyIDw8IDIpOwotCi0JCWlmIChhbWRncHVfc3Jpb3ZfdmYoYWRl dikpIHsKLQkJCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5zZG1hLm51bV9pbnN0YW5jZXM7IGkrKykg ewotCQkJCWlmICgmYWRldi0+c2RtYS5pbnN0YW5jZVtpXS5yaW5nID09IHJpbmcpIHsKLQkJCQkJ b2Zmc2V0ID0gYWRldi0+c2RtYS5pbnN0YW5jZVtpXS5wb2xsX21lbV9vZmZzOwotCQkJCQlhdG9t aWM2NF9zZXQoKGF0b21pYzY0X3QgKikmYWRldi0+d2Iud2Jbb2Zmc2V0XSwKLQkJCQkJCSAgICAg KHJpbmctPndwdHIgPDwgMikpOwotCQkJCX0KLQkJCX0KLQkJfQogCQlXRE9PUkJFTEw2NChyaW5n LT5kb29yYmVsbF9pbmRleCwgcmluZy0+d3B0ciA8PCAyKTsKIAl9IGVsc2UgewogCQlpbnQgbWUg PSAocmluZyA9PSAmcmluZy0+YWRldi0+c2RtYS5pbnN0YW5jZVswXS5yaW5nKSA/IDAgOiAxOwpA QCAtNTg1LDEyICs1NzMsMTMgQEAgc3RhdGljIHZvaWQgc2RtYV92NF8wX2VuYWJsZShzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiwgYm9vbCBlbmFibGUpCiBzdGF0aWMgaW50IHNkbWFfdjRfMF9n ZnhfcmVzdW1lKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogewogCXN0cnVjdCBhbWRncHVf cmluZyAqcmluZzsKLQl1MzIgcmJfY250bCwgaWJfY250bCwgd3B0cl9wb2xsX2FkZHJfbG8sIHdw dHJfcG9sbF9hZGRyX2hpLCB3cHRyX3BvbGxfY250bDsKKwl1MzIgcmJfY250bCwgaWJfY250bCwg d3B0cl9wb2xsX2NudGw7CiAJdTMyIHJiX2J1ZnN6OwotCXUzMiB3Yl9vZmZzZXQsIHBvbGxfb2Zm c2V0OworCXUzMiB3Yl9vZmZzZXQ7CiAJdTMyIGRvb3JiZWxsOwogCXUzMiBkb29yYmVsbF9vZmZz ZXQ7CiAJdTMyIHRlbXA7CisJdTY0IHdwdHJfZ3B1X2FkZHI7CiAJaW50IGksIHI7CiAKIAlmb3Ig KGkgPSAwOyBpIDwgYWRldi0+c2RtYS5udW1faW5zdGFuY2VzOyBpKyspIHsKQEAgLTcwMSwxNyAr NjkwLDE0IEBAIHN0YXRpYyBpbnQgc2RtYV92NF8wX2dmeF9yZXN1bWUoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYpCiAJCQlhbWRncHVfdHRtX3NldF9hY3RpdmVfdnJhbV9zaXplKGFkZXYsIGFk ZXYtPm1jLnJlYWxfdnJhbV9zaXplKTsKIAogCQlpZiAoYW1kZ3B1X3NyaW92X3ZmKGFkZXYpKSB7 Ci0JCQlwb2xsX29mZnNldCA9IGFkZXYtPnNkbWEuaW5zdGFuY2VbaV0ucG9sbF9tZW1fb2ZmcyAq IDQ7Ci0KKwkJCXdwdHJfZ3B1X2FkZHIgPSBhZGV2LT53Yi5ncHVfYWRkciArIChyaW5nLT53cHRy X29mZnMgKiA0KTsKIAkJCXdwdHJfcG9sbF9jbnRsID0gUlJFRzMyKHNkbWFfdjRfMF9nZXRfcmVn X29mZnNldChpLCBtbVNETUEwX0dGWF9SQl9XUFRSX1BPTExfQ05UTCkpOwotCQkJd3B0cl9wb2xs X2FkZHJfbG8gPSBSUkVHMzIoc2RtYV92NF8wX2dldF9yZWdfb2Zmc2V0KGksIG1tU0RNQTBfR0ZY X1JCX1dQVFJfUE9MTF9BRERSX0xPKSk7Ci0JCQl3cHRyX3BvbGxfYWRkcl9sbyA9IFJFR19TRVRf RklFTEQod3B0cl9wb2xsX2FkZHJfbG8sIFNETUEwX0dGWF9SQl9XUFRSX1BPTExfQUREUl9MTywg QUREUiwKLQkJCQkJCQkJbG93ZXJfMzJfYml0cyhhZGV2LT53Yi5ncHVfYWRkciArIHBvbGxfb2Zm c2V0KSA+PiAyKTsKLQkJCXdwdHJfcG9sbF9hZGRyX2hpID0gdXBwZXJfMzJfYml0cyhhZGV2LT53 Yi5ncHVfYWRkciArIHBvbGxfb2Zmc2V0KTsKIAkJCXdwdHJfcG9sbF9jbnRsID0gUkVHX1NFVF9G SUVMRCh3cHRyX3BvbGxfY250bCwgU0RNQTBfR0ZYX1JCX1dQVFJfUE9MTF9DTlRMLCBGMzJfUE9M TF9FTkFCTEUsIDEpOwogCi0JCQlXUkVHMzIoc2RtYV92NF8wX2dldF9yZWdfb2Zmc2V0KGksIG1t U0RNQTBfR0ZYX1JCX1dQVFJfUE9MTF9BRERSX0xPKSwgd3B0cl9wb2xsX2FkZHJfbG8pOwotCQkJ V1JFRzMyKHNkbWFfdjRfMF9nZXRfcmVnX29mZnNldChpLCBtbVNETUEwX0dGWF9SQl9XUFRSX1BP TExfQUREUl9ISSksIHdwdHJfcG9sbF9hZGRyX2hpKTsKKwkJCVdSRUczMihzZG1hX3Y0XzBfZ2V0 X3JlZ19vZmZzZXQoaSwgbW1TRE1BMF9HRlhfUkJfV1BUUl9QT0xMX0FERFJfTE8pLAorCQkJICAg ICAgIGxvd2VyXzMyX2JpdHMod3B0cl9ncHVfYWRkcikpOworCQkJV1JFRzMyKHNkbWFfdjRfMF9n ZXRfcmVnX29mZnNldChpLCBtbVNETUEwX0dGWF9SQl9XUFRSX1BPTExfQUREUl9ISSksCisJCQkg ICAgICAgdXBwZXJfMzJfYml0cyh3cHRyX2dwdV9hZGRyKSk7CiAJCQlXUkVHMzIoc2RtYV92NF8w X2dldF9yZWdfb2Zmc2V0KGksIG1tU0RNQTBfR0ZYX1JCX1dQVFJfUE9MTF9DTlRMKSwgd3B0cl9w b2xsX2NudGwpOwogCQl9CiAJfQpAQCAtMTI3NCwxNSArMTI2MCw2IEBAIHN0YXRpYyBpbnQgc2Rt YV92NF8wX3N3X2luaXQodm9pZCAqaGFuZGxlKQogCQkJCSAgICAgKGkgPT0gMCkgPwogCQkJCSAg ICAgQU1ER1BVX1NETUFfSVJRX1RSQVAwIDoKIAkJCQkgICAgIEFNREdQVV9TRE1BX0lSUV9UUkFQ MSk7Ci0KLQkJaWYgKGFtZGdwdV9zcmlvdl92ZihhZGV2KSkgewotCQkJciA9IGFtZGdwdV93Yl9n ZXRfNjRiaXQoYWRldiwKLQkJCQkJCSZhZGV2LT5zZG1hLmluc3RhbmNlW2ldLnBvbGxfbWVtX29m ZnMpOwotCQkJaWYgKHIpIHsKLQkJCQlkZXZfZXJyKGFkZXYtPmRldiwgIiglZCkgZmFpbGVkIHRv IGFsbG9jYXRlIFNETUEgcG9sbCBtZW0gd2IuXG4iLCByKTsKLQkJCQlyZXR1cm4gcjsKLQkJCX0K LQkJfQogCQlpZiAocikKIAkJCXJldHVybiByOwogCX0KQEAgLTEyOTUsMTMgKzEyNzIsOSBAQCBz dGF0aWMgaW50IHNkbWFfdjRfMF9zd19maW5pKHZvaWQgKmhhbmRsZSkKIAlzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqKWhhbmRsZTsKIAlpbnQgaTsK IAotCWZvciAoaSA9IDA7IGkgPCBhZGV2LT5zZG1hLm51bV9pbnN0YW5jZXM7IGkrKykgeworCWZv ciAoaSA9IDA7IGkgPCBhZGV2LT5zZG1hLm51bV9pbnN0YW5jZXM7IGkrKykKIAkJYW1kZ3B1X3Jp bmdfZmluaSgmYWRldi0+c2RtYS5pbnN0YW5jZVtpXS5yaW5nKTsKIAotCQlpZiAoYW1kZ3B1X3Ny aW92X3ZmKGFkZXYpKQotCQkJYW1kZ3B1X3diX2ZyZWVfNjRiaXQoYWRldiwKLQkJCQkJICAgICBh ZGV2LT5zZG1hLmluc3RhbmNlW2ldLnBvbGxfbWVtX29mZnMpOwotCX0KIAlyZXR1cm4gMDsKIH0K IAotLSAKMi41LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=