mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
media: rockchip: vicap fixes error triggrer of fs/fe not match when monitor mode enable
Change-Id: I4fa5502064f6a589a87a9e675d00bd0d237a839d Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
This commit is contained in:
@@ -11086,7 +11086,8 @@ static bool rkcif_is_csi2_err_trigger_reset(struct rkcif_timer *timer)
|
||||
* or fs and fe had been not paired.
|
||||
*/
|
||||
if (stream->is_fs_fe_not_paired ||
|
||||
stream->fs_cnt_in_single_frame > RKCIF_FS_DETECTED_NUM) {
|
||||
(stream->fs_cnt_in_single_frame > RKCIF_FS_DETECTED_NUM &&
|
||||
dev->chip_id < CHIP_RK3588_CIF)) {
|
||||
is_triggered = true;
|
||||
v4l2_info(&dev->v4l2_dev, "reset for fs & fe not paired\n");
|
||||
}
|
||||
@@ -13968,9 +13969,6 @@ static void rkcif_deal_sof(struct rkcif_device *cif_dev)
|
||||
RKISP_VICAP_CMD_SOF, &sof);
|
||||
}
|
||||
|
||||
if (cif_dev->chip_id < CHIP_RK3588_CIF)
|
||||
detect_stream->fs_cnt_in_single_frame++;
|
||||
|
||||
if (cif_dev->sditf[0] &&
|
||||
cif_dev->sditf[0]->mode.rdbk_mode >= RKISP_VICAP_RDBK_AIQ &&
|
||||
(!detect_stream->dma_en) && cif_dev->chip_id < CHIP_RK3576_CIF)
|
||||
|
||||
Reference in New Issue
Block a user