From 087a57f504be511b244bf541822cccc1c511c079 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Thu, 8 May 2025 10:06:50 +0800 Subject: [PATCH] media: rockchip: vicap fixes error condition of disable online Change-Id: I0d9bcca0c76a76f522a596e8326f434d71a501da Signed-off-by: Zefa Chen --- drivers/media/platform/rockchip/cif/capture.c | 3 ++- drivers/media/platform/rockchip/cif/subdev-itf.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 5327a7912a7a..0ca06722885b 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -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))) diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c index dd5fed1021e1..1d169bc2f466 100644 --- a/drivers/media/platform/rockchip/cif/subdev-itf.c +++ b/drivers/media/platform/rockchip/cif/subdev-itf.c @@ -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;