diff --git a/drivers/video/rockchip/rga2/rga2_debugger.c b/drivers/video/rockchip/rga2/rga2_debugger.c
index 828a6befad12..66ba484df9a9 100644
--- a/drivers/video/rockchip/rga2/rga2_debugger.c
+++ b/drivers/video/rockchip/rga2/rga2_debugger.c
@@ -278,13 +278,12 @@ static int rga_procfs_open(struct inode *inode, struct file *file)
 	return single_open(file, node->info_ent->show, node);
 }
 
-static const struct file_operations rga_procfs_fops = {
-	.owner   = THIS_MODULE,
-	.open    = rga_procfs_open,
-	.read    = seq_read,
-	.llseek  = seq_lseek,
-	.release = single_release,
-	.write   = rga_debugger_write,
+static const struct proc_ops rga_procfs_fops = {
+	.proc_open = rga_procfs_open,
+	.proc_read = seq_read,
+	.proc_lseek = seq_lseek,
+	.proc_release = single_release,
+	.proc_write = rga_debugger_write,
 };
 
 static int rga_procfs_remove_files(struct rga_debugger *debugger)
diff --git a/drivers/video/rockchip/rga2/rga2_mmu_info.c b/drivers/video/rockchip/rga2/rga2_mmu_info.c
index 2b05c9356c3a..a01ba08e6ff8 100644
--- a/drivers/video/rockchip/rga2/rga2_mmu_info.c
+++ b/drivers/video/rockchip/rga2/rga2_mmu_info.c
@@ -265,12 +265,20 @@ static int rga2_dma_memory_check(struct rga_dma_buffer_t *buffer,
 {
 	int ret = 0;
 	void *vaddr;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+	struct iosys_map map;
+#endif
 	struct dma_buf *dma_buffer;
 
 	dma_buffer = buffer->dma_buf;
 
 	if (!IS_ERR_OR_NULL(dma_buffer)) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+		ret = dma_buf_vmap(dma_buffer, &map);
+		vaddr = ret ? NULL : map.vaddr;
+#else
 		vaddr = dma_buf_vmap(dma_buffer);
+#endif
 		if (vaddr) {
 			ret = rga2_virtual_memory_check(vaddr, img->vir_w, img->vir_h,
 							img->format, img->yrgb_addr);
@@ -279,7 +287,11 @@ static int rga2_dma_memory_check(struct rga_dma_buffer_t *buffer,
 			return -EINVAL;
 		}
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+		dma_buf_vunmap(dma_buffer, &map);
+#else
 		dma_buf_vunmap(dma_buffer, vaddr);
+#endif
 	}
 
 	return ret;