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

media: rockchip: isp: fix sensor off to enable reset

Browse Source 
Change-Id: If167d6f6f2928a554df42eab691406428d69f281
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2023-02-21 15:24:18 +08:00
parent ed2c9c09f4
commit 560194a6c5
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,6 +333,12 @@ static int rkisp_pipeline_set_stream(struct rkisp_pipeline *p, bool on)
goto err_stream_off;
}
} else {
if (dev->hw_dev->monitor.is_en) {
dev->hw_dev->monitor.is_en = 0;
dev->hw_dev->monitor.state = ISP_STOP;
if (!completion_done(&dev->hw_dev->monitor.cmpl))
complete(&dev->hw_dev->monitor.cmpl);
}
/* sensor -> phy */
for (i = p->num_subdevs - 1; i >= 0; --i) {
if ((dev->vicap_in.merge_num > 1) &&

7
drivers/media/platform/rockchip/isp/rkisp.c
View File

@@ -1981,13 +1981,6 @@ static int rkisp_isp_stop(struct rkisp_device *dev)
if (atomic_read(&dev->hw_dev->refcnt) > 1)
goto end;
if (dev->hw_dev->monitor.is_en) {
dev->hw_dev->monitor.is_en = 0;
dev->hw_dev->monitor.state = ISP_STOP;
if (!completion_done(&dev->hw_dev->monitor.cmpl))
complete(&dev->hw_dev->monitor.cmpl);
}
/*
* ISP(mi) stop in mi frame end -> Stop ISP(mipi) ->
* Stop ISP(isp) ->wait for ISP isp off