From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/drivers/rknpu/rknpu_mem.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/kernel/drivers/rknpu/rknpu_mem.c b/kernel/drivers/rknpu/rknpu_mem.c
index ff7e92d..5242f15 100644
--- a/kernel/drivers/rknpu/rknpu_mem.c
+++ b/kernel/drivers/rknpu/rknpu_mem.c
@@ -15,6 +15,8 @@
#include "rknpu_ioctl.h"
#include "rknpu_mem.h"
+#ifdef CONFIG_ROCKCHIP_RKNPU_DMA_HEAP
+
int rknpu_mem_create_ioctl(struct rknpu_device *rknpu_dev, unsigned long data,
struct file *file)
{
@@ -108,7 +110,7 @@
}
page_count = length >> PAGE_SHIFT;
- pages = kmalloc_array(page_count, sizeof(struct page), GFP_KERNEL);
+ pages = vmalloc(page_count * sizeof(struct page));
if (!pages) {
LOG_ERROR("alloc pages failed\n");
ret = -ENOMEM;
@@ -146,7 +148,8 @@
goto err_unmap_kv_addr;
}
- kfree(pages);
+ vfree(pages);
+ pages = NULL;
dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL);
dma_buf_detach(dmabuf, attachment);
@@ -169,7 +172,8 @@
rknpu_obj->kv_addr = NULL;
err_free_pages:
- kfree(pages);
+ vfree(pages);
+ pages = NULL;
err_detach_dma_buf:
dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL);
@@ -292,7 +296,9 @@
{
struct rknpu_mem_object *rknpu_obj = NULL;
struct rknpu_mem_sync args;
+#ifdef CONFIG_DMABUF_PARTIAL
struct dma_buf *dmabuf;
+#endif
int ret = -EFAULT;
if (unlikely(copy_from_user(&args, (struct rknpu_mem_sync *)data,
@@ -310,7 +316,6 @@
}
rknpu_obj = (struct rknpu_mem_object *)(uintptr_t)args.obj_addr;
- dmabuf = rknpu_obj->dmabuf;
#ifndef CONFIG_DMABUF_PARTIAL
if (args.flags & RKNPU_MEM_SYNC_TO_DEVICE) {
@@ -322,6 +327,7 @@
DMA_FROM_DEVICE, true);
}
#else
+ dmabuf = rknpu_obj->dmabuf;
if (args.flags & RKNPU_MEM_SYNC_TO_DEVICE) {
dmabuf->ops->end_cpu_access_partial(dmabuf, DMA_TO_DEVICE,
args.offset, args.size);
@@ -334,3 +340,5 @@
return 0;
}
+
+#endif
--
Gitblit v1.6.2