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: platform: cif: fix multi dev issue

Browse Source 
if rkcif_dvp & rkcif_mipi_all registered,
close rkcif_dvp streams alone can't reset rkcif,
only rkcif_dvp & mipi dev all close can do reset.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I103ca247a0866629d351699f752293af028d29d5
This commit is contained in:
Wang Panzhenzhuan
2021-05-17 10:23:02 +08:00
committed by Tao Huang
parent 8cf5c599ca
commit cbb6b0b79d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1942,6 +1942,9 @@ static void rkcif_stop_streaming(struct vb2_queue *queue)
struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
struct rkcif_buffer *buf = NULL;
int ret;
struct rkcif_hw *hw_dev = dev->hw_dev;
bool can_reset = true;
int i;
mutex_lock(&dev->stream_lock);
@@ -2006,7 +2009,14 @@ static void rkcif_stop_streaming(struct vb2_queue *queue)
dev->can_be_reset = true;
}
if (dev->can_be_reset && !atomic_read(&(dev->pipe.stream_cnt))) {
for (i = 0; i < hw_dev->dev_num; i++) {
if (atomic_read(&hw_dev->cif_dev[i]->pipe.stream_cnt) != 0) {
can_reset = false;
break;
}
}
if (dev->can_be_reset && can_reset) {
rkcif_do_cru_reset(dev);
dev->can_be_reset = false;
dev->reset_work_cancel = true;