From f70575805708cabdedea7498aaa3f710fde4d920 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 31 Jan 2024 03:29:01 +0000
Subject: [PATCH] add lvds1024*800
---
kernel/drivers/rknpu/rknpu_mem.c | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/kernel/drivers/rknpu/rknpu_mem.c b/kernel/drivers/rknpu/rknpu_mem.c
index ff7e92d..858c21f 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)
{
@@ -107,22 +109,27 @@
__LINE__, &phys, length);
}
- page_count = length >> PAGE_SHIFT;
- pages = kmalloc_array(page_count, sizeof(struct page), GFP_KERNEL);
- if (!pages) {
- LOG_ERROR("alloc pages failed\n");
- ret = -ENOMEM;
- goto err_detach_dma_buf;
- }
+ if (args.flags & RKNPU_MEM_KERNEL_MAPPING) {
+ page_count = length >> PAGE_SHIFT;
+ pages = vmalloc(page_count * sizeof(struct page));
+ if (!pages) {
+ LOG_ERROR("alloc pages failed\n");
+ ret = -ENOMEM;
+ goto err_detach_dma_buf;
+ }
- for (i = 0; i < page_count; i++)
- pages[i] = &page[i];
+ for (i = 0; i < page_count; i++)
+ pages[i] = &page[i];
- rknpu_obj->kv_addr = vmap(pages, page_count, VM_MAP, PAGE_KERNEL);
- if (!rknpu_obj->kv_addr) {
- LOG_ERROR("vmap pages addr failed\n");
- ret = -ENOMEM;
- goto err_free_pages;
+ rknpu_obj->kv_addr =
+ vmap(pages, page_count, VM_MAP, PAGE_KERNEL);
+ if (!rknpu_obj->kv_addr) {
+ LOG_ERROR("vmap pages addr failed\n");
+ ret = -ENOMEM;
+ goto err_free_pages;
+ }
+ vfree(pages);
+ pages = NULL;
}
rknpu_obj->size = PAGE_ALIGN(args.size);
@@ -146,7 +153,6 @@
goto err_unmap_kv_addr;
}
- kfree(pages);
dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL);
dma_buf_detach(dmabuf, attachment);
@@ -169,7 +175,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 +299,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 +319,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 +330,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 +343,5 @@
return 0;
}
+
+#endif
--
Gitblit v1.6.2