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

media: rockchip: isp: fix pm runtime return -EACCES for thunderboot

Browse Source 
Change-Id: I279f171dc3756b0fa64185745678223d7c94e4d3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2022-08-20 10:21:46 +08:00
committed by Tao Huang
parent d97ebe62c6
commit 2a2955cd9e
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/rockchip/isp/capture.c
View File

@@ -1867,8 +1867,18 @@ static void rkisp_stream_fast(struct work_struct *work)
struct rkisp_stream *stream = &cap_dev->stream[0];
struct rkisp_device *ispdev = cap_dev->ispdev;
struct v4l2_subdev *sd = ispdev->active_sensor->sd;
int ret;
if (ispdev->isp_ver != ISP_V30)
return;
ret = v4l2_pipeline_pm_get(&stream->vnode.vdev.entity);
if (ret < 0) {
dev_err(ispdev->dev, "%s PM get fail:%d\n", __func__, ret);
ispdev->is_thunderboot = false;
return;
}
v4l2_pipeline_pm_get(&stream->vnode.vdev.entity);
rkisp_chk_tb_over(ispdev);
if (ispdev->tb_head.complete != RKISP_TB_OK) {
v4l2_pipeline_pm_put(&stream->vnode.vdev.entity);

3
drivers/media/platform/rockchip/isp/dev.c
View File

@@ -888,6 +888,7 @@ static int rkisp_plat_probe(struct platform_device *pdev)
goto err_unreg_v4l2_dev;
}
pm_runtime_enable(dev);
/* create & register platefom subdev (from of_node) */
ret = rkisp_register_platform_subdevs(isp_dev);
if (ret < 0)
@@ -901,8 +902,6 @@ static int rkisp_plat_probe(struct platform_device *pdev)
mutex_lock(&rkisp_dev_mutex);
list_add_tail(&isp_dev->list, &rkisp_device_list);
mutex_unlock(&rkisp_dev_mutex);
pm_runtime_enable(dev);
return 0;
err_unreg_media_dev: