shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: rga2: adapt to kernel-6.1

Browse Source 
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I08d3b7a852b450f91327d65110f818b6cdf9545d
This commit is contained in:
Yu Qiaowei
2023-06-25 02:29:04 +00:00
committed by Tao Huang
parent 76d0205dc7
commit 04824b83ee
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/video/rockchip/rga2/rga2_debugger.c
View File

@@ -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)

12
drivers/video/rockchip/rga2/rga2_mmu_info.c
View File

@@ -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;