From 15ade055295d13f95d49e3d99b09f3bbfb4a43e7 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 06 Nov 2023 07:25:24 +0000
Subject: [PATCH] add at24 driver
---
kernel/drivers/video/rockchip/rga3/rga_debugger.c | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/kernel/drivers/video/rockchip/rga3/rga_debugger.c b/kernel/drivers/video/rockchip/rga3/rga_debugger.c
index 068e0cc..fe21031 100644
--- a/kernel/drivers/video/rockchip/rga3/rga_debugger.c
+++ b/kernel/drivers/video/rockchip/rga3/rga_debugger.c
@@ -621,7 +621,11 @@
#ifdef CONFIG_ROCKCHIP_RGA_PROC_FS
static int rga_procfs_open(struct inode *inode, struct file *file)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ struct rga_debugger_node *node = pde_data(inode);
+#else
struct rga_debugger_node *node = PDE_DATA(inode);
+#endif
return single_open(file, node->info_ent->show, node);
}
@@ -826,16 +830,6 @@
req->core, req->priority, req->in_fence_fd);
}
-void rga_dump_external_buffer(struct rga_external_buffer *buffer)
-{
- pr_info("external: memory = 0x%lx, type = %s\n",
- (unsigned long)buffer->memory, rga_get_memory_type_str(buffer->type));
- pr_info("param: w = %d, h = %d, f = %s, size = %d\n",
- buffer->memory_parm.width, buffer->memory_parm.height,
- rga_get_format_name(buffer->memory_parm.format),
- buffer->memory_parm.size);
-}
-
#ifdef CONFIG_NO_GKI
static int rga_dump_image_to_file(struct rga_internal_buffer *dump_buffer,
const char *channel_name,
@@ -846,6 +840,10 @@
struct file *file;
size_t size = 0;
loff_t pos = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ int ret;
+ struct iosys_map map;
+#endif
void *kvaddr = NULL;
void *kvaddr_origin = NULL;
@@ -858,7 +856,12 @@
return -EINVAL;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ ret = dma_buf_vmap(dump_buffer->dma_buffer->dma_buf, &map);
+ kvaddr = ret ? NULL : map.vaddr;
+#else
kvaddr = dma_buf_vmap(dump_buffer->dma_buffer->dma_buf);
+#endif
if (!kvaddr) {
pr_err("can't vmap the dma buffer!\n");
return -EINVAL;
@@ -928,7 +931,11 @@
switch (dump_buffer->type) {
case RGA_DMA_BUFFER:
case RGA_DMA_BUFFER_PTR:
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+ dma_buf_vunmap(dump_buffer->dma_buffer->dma_buf, &map);
+#else
dma_buf_vunmap(dump_buffer->dma_buffer->dma_buf, kvaddr_origin);
+#endif
break;
case RGA_VIRTUAL_ADDRESS:
vunmap(kvaddr_origin);
--
Gitblit v1.6.2