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

media: rockchip: vicap fixes error condition of disable online

Browse Source 
Change-Id: I0d9bcca0c76a76f522a596e8326f434d71a501da
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
This commit is contained in:
Zefa Chen
2025-05-08 10:06:50 +08:00
parent 6e5b2259f9
commit 087a57f504
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13776,7 +13776,8 @@ static void rkcif_toisp_check_stop_status(struct sditf_priv *priv,
rkcif_scale_start(stream->scale_vdev);
}
}
if (priv->mode.rdbk_mode == RKISP_VICAP_ONLINE_MULTI &&
if ((priv->mode_src.rdbk_mode == RKISP_VICAP_ONLINE_MULTI ||
priv->mode_src.rdbk_mode == RKISP_VICAP_ONLINE_UNITE) &&
((priv->hdr_cfg.hdr_mode == NO_HDR && stream->id == 0) ||
(priv->hdr_cfg.hdr_mode == HDR_X2 && stream->id == 1) ||
(priv->hdr_cfg.hdr_mode == HDR_X3 && stream->id == 2)))

3
drivers/media/platform/rockchip/cif/subdev-itf.c
View File

@@ -591,7 +591,8 @@ static long sditf_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
if (*on) {
sditf_enable_immediately(priv);
} else {
if (priv->mode.rdbk_mode != RKISP_VICAP_ONLINE_MULTI)
if (priv->mode.rdbk_mode != RKISP_VICAP_ONLINE_MULTI &&
priv->mode.rdbk_mode != RKISP_VICAP_ONLINE_UNITE)
sditf_disable_immediately(priv);
}
return 0;