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

media: rockchip: vicap fixes error of switch logic when one of sensor is stream off

Browse Source 
Change-Id: I698568cf4bb1dc9c84a27a88a2d5420b7abf773b
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
This commit is contained in:
Zefa Chen
2025-07-24 16:04:04 +08:00
committed by Tao Huang
parent fdc5d20c46
commit 314fcb5f92
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1902,7 +1902,7 @@ static void rkcif_s_rx_buffer(struct rkcif_stream *stream, struct rkisp_rx_buf *
}
if ((dev->rdbk_debug &&
dbufs->sequence < 15) ||
rkcif_debug == 3)
rkcif_debug >= 3)
v4l2_info(&dev->v4l2_dev,
"s_buf seq %d type %d, dma addr %x, %lld\n",
dbufs->sequence, dbufs->type, (u32)rx_buf->dummy.dma_addr,
@@ -15144,20 +15144,27 @@ void rkcif_irq_pingpong_v1(struct rkcif_device *cif_dev)
continue;
if (cif_dev->switch_info.is_use_switch) {
v4l2_dbg(5, rkcif_debug, &cif_dev->v4l2_dev,
"%s %d: switch_info.is_use_switch = %d, is_active = %d, sensor_off = %d\n",
__func__, __LINE__,
cif_dev->switch_info.is_use_switch,
cif_dev->switch_info.is_active,
atomic_read(&cif_dev->sensor_off));
if (cif_dev->switch_info.is_active) {
cif_dev->switch_info.is_active = false;
cif_dev->switch_info.switch_dev->switch_info.is_active = true;
stream = &cif_dev->stream[mipi_id];
if (cif_dev->switch_info.switch_dev->stream[0].state == RKCIF_STATE_STREAMING)
if (atomic_read(&cif_dev->switch_info.switch_dev->sensor_off) == 0) {
cif_dev->switch_info.is_active = false;
cif_dev->switch_info.switch_dev->switch_info.is_active = true;
rkcif_switch_change(cif_dev, !!cif_dev->switch_info.switch_dev->switch_info.gpio_val);
}
} else {
cif_dev->switch_info.is_active = true;
cif_dev->switch_info.switch_dev->switch_info.is_active = false;
stream = &cif_dev->switch_info.switch_dev->stream[mipi_id];
if (cif_dev->stream[0].state == RKCIF_STATE_STREAMING)
if (atomic_read(&cif_dev->sensor_off) == 0) {
cif_dev->switch_info.is_active = true;
cif_dev->switch_info.switch_dev->switch_info.is_active = false;
rkcif_switch_change(cif_dev, !!cif_dev->switch_info.gpio_val);
}
}
} else {
stream = &cif_dev->stream[mipi_id];
}