enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/video/rockchip/rga3/rga_debugger.c
..
..
@@ -621,11 +621,7 @@
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
627
624
 	struct rga_debugger_node *node = PDE_DATA(inode);
628
-#endif
629
625
 
630
626
 	return single_open(file, node->info_ent->show, node);
631
627
 }
..
..
@@ -840,10 +836,6 @@
840
836
 	struct file *file;
841
837
 	size_t size = 0;
842
838
 	loff_t pos = 0;
843
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
844
-	int ret;
845
-	struct iosys_map map;
846
-#endif
847
839
 	void *kvaddr = NULL;
848
840
 	void *kvaddr_origin = NULL;
849
841
 
..
..
@@ -856,12 +848,7 @@
856
848
 			return -EINVAL;
857
849
 		}
858
850
 
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
863
851
 		kvaddr = dma_buf_vmap(dump_buffer->dma_buffer->dma_buf);
864
-#endif
865
852
 		if (!kvaddr) {
866
853
 			pr_err("can't vmap the dma buffer!\n");
867
854
 			return -EINVAL;
..
..
@@ -931,11 +918,7 @@
931
918
 	switch (dump_buffer->type) {
932
919
 	case RGA_DMA_BUFFER:
933
920
 	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
937
921
 		dma_buf_vunmap(dump_buffer->dma_buffer->dma_buf, kvaddr_origin);
938
-#endif
939
922
 		break;
940
923
 	case RGA_VIRTUAL_ADDRESS:
941
924
 		vunmap(kvaddr_origin);