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

video: rockchip: mpp: print err if mpp_task_attach_fd fail

Browse Source 
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I0eacd83fb14cc9123a0ab150d93736b11d8f4b67
This commit is contained in:
Jianqun Xu
2022-04-26 18:54:43 +08:00
committed by Tao Huang
parent de3a995b83
commit eb21d6476e
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/rockchip/mpp/mpp_iep2.c
View File

@@ -266,8 +266,8 @@ static int iep2_process_reg_fd(struct mpp_session *session,
mem_region = mpp_task_attach_fd(&task->mpp_task, usr_fd);
if (IS_ERR(mem_region)) {
mpp_debug(DEBUG_IOMMU, "reg[%3d]: %08x failed\n",
iep2_addr_rnum[i], paddr[i]);
mpp_err("reg[%03d]: %08x failed\n",
iep2_addr_rnum[i], paddr[i]);
return PTR_ERR(mem_region);
}

6
drivers/video/rockchip/mpp/mpp_rkvdec.c
View File

@@ -593,6 +593,7 @@ static int fill_scaling_list_pps(struct rkvdec_task *task,
mem_region = mpp_task_attach_fd(&task->mpp_task,
scaling_fd);
if (IS_ERR(mem_region)) {
mpp_err("scaling list fd %d attach failed\n", scaling_fd);
ret = PTR_ERR(mem_region);
goto done;
}
@@ -727,8 +728,11 @@ static int rkvdec_process_reg_fd(struct mpp_session *session,
offset = task->reg[idx] >> 10 << 4;
}
mem_region = mpp_task_attach_fd(&task->mpp_task, fd);
if (IS_ERR(mem_region))
if (IS_ERR(mem_region)) {
mpp_err("reg[%03d]: %08x fd %d attach failed\n",
idx, task->reg[idx], fd);
return -EFAULT;
}
iova = mem_region->iova;
task->reg[idx] = iova + offset;

5
drivers/video/rockchip/mpp/mpp_vdpu1.c
View File

@@ -263,8 +263,11 @@ static int vdpu_process_reg_fd(struct mpp_session *session,
offset = task->reg[idx] >> 10 << 4;
}
mem_region = mpp_task_attach_fd(&task->mpp_task, fd);
if (IS_ERR(mem_region))
if (IS_ERR(mem_region)) {
mpp_err("reg[%03d]: %08x fd %d attach failed\n",
idx, task->reg[idx], fd);
goto fail;
}
iova = mem_region->iova;
mpp_debug(DEBUG_IOMMU, "DMV[%3d]: %3d => %pad + offset %10d\n",

5
drivers/video/rockchip/mpp/mpp_vdpu2.c
View File

@@ -224,8 +224,11 @@ static int vdpu_process_reg_fd(struct mpp_session *session,
offset = task->reg[idx] >> 10 << 4;
}
mem_region = mpp_task_attach_fd(&task->mpp_task, fd);
if (IS_ERR(mem_region))
if (IS_ERR(mem_region)) {
mpp_err("reg[%3d]: %08x fd %d attach failed\n",
idx, task->reg[idx], fd);
return -EFAULT;
}
iova = mem_region->iova;
mpp_debug(DEBUG_IOMMU, "DMV[%3d]: %3d => %pad + offset %10d\n",