rk3568 rt init

hc

2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84

 kernel/drivers/video/rockchip/rga3/rga_debugger.c
..
..
@@ -621,7 +621,11 @@
621
621
 #ifdef CONFIG_ROCKCHIP_RGA_PROC_FS
622
622
 static int rga_procfs_open(struct inode *inode, struct file *file)
623
623
 {
624
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
625
+	struct rga_debugger_node *node = pde_data(inode);
626
+#else
624
627
 	struct rga_debugger_node *node = PDE_DATA(inode);
628
+#endif
625
629
 
626
630
 	return single_open(file, node->info_ent->show, node);
627
631
 }
..
..
@@ -826,16 +830,6 @@
826
830
 		req->core, req->priority, req->in_fence_fd);
827
831
 }
828
832
 
829
-void rga_dump_external_buffer(struct rga_external_buffer *buffer)
830
-{
831
-	pr_info("external: memory = 0x%lx, type = %s\n",
832
-		(unsigned long)buffer->memory, rga_get_memory_type_str(buffer->type));
833
-	pr_info("param: w = %d, h = %d, f = %s, size = %d\n",
834
-		buffer->memory_parm.width, buffer->memory_parm.height,
835
-		rga_get_format_name(buffer->memory_parm.format),
836
-		buffer->memory_parm.size);
837
-}
838
-
839
833
 #ifdef CONFIG_NO_GKI
840
834
 static int rga_dump_image_to_file(struct rga_internal_buffer *dump_buffer,
841
835
 				  const char *channel_name,
..
..
@@ -846,6 +840,10 @@
846
840
 	struct file *file;
847
841
 	size_t size = 0;
848
842
 	loff_t pos = 0;
843
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
844
+	int ret;
845
+	struct iosys_map map;
846
+#endif
849
847
 	void *kvaddr = NULL;
850
848
 	void *kvaddr_origin = NULL;
851
849
 
..
..
@@ -858,7 +856,12 @@
858
856
 			return -EINVAL;
859
857
 		}
860
858
 
859
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
860
+		ret = dma_buf_vmap(dump_buffer->dma_buffer->dma_buf, &map);
861
+		kvaddr = ret ? NULL : map.vaddr;
862
+#else
861
863
 		kvaddr = dma_buf_vmap(dump_buffer->dma_buffer->dma_buf);
864
+#endif
862
865
 		if (!kvaddr) {
863
866
 			pr_err("can't vmap the dma buffer!\n");
864
867
 			return -EINVAL;
..
..
@@ -928,7 +931,11 @@
928
931
 	switch (dump_buffer->type) {
929
932
 	case RGA_DMA_BUFFER:
930
933
 	case RGA_DMA_BUFFER_PTR:
934
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
935
+		dma_buf_vunmap(dump_buffer->dma_buffer->dma_buf, &map);
936
+#else
931
937
 		dma_buf_vunmap(dump_buffer->dma_buffer->dma_buf, kvaddr_origin);
938
+#endif
932
939
 		break;
933
940
 	case RGA_VIRTUAL_ADDRESS:
934
941
 		vunmap(kvaddr_origin);