From 93ffc33081edcc961cd169daa443695771b0b76c Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Sat, 5 Mar 2022 12:48:02 +0800 Subject: [PATCH] media: rockchip: vicap: rk3588 fix HDR capture bug in line_info or id_code mode Signed-off-by: Zefa Chen Change-Id: I5cd12597e5bdebebbe7cd502f7aa7cad6d4887d2 --- drivers/media/platform/rockchip/cif/capture.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index c0984764cbbf..cd523e2a8b6b 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -2372,6 +2372,11 @@ static int rkcif_csi_channel_set_v1(struct rkcif_stream *stream, channel->id); if (mbus_type == V4L2_MBUS_CSI2_DPHY || mbus_type == V4L2_MBUS_CSI2_CPHY) { + + if (stream->cifdev->hdr.esp.mode == HDR_LINE_CNT || + stream->cifdev->hdr.esp.mode == HDR_ID_CODE) + channel->vc = 0; + val = CSI_ENABLE_CAPTURE | dma_en | channel->cmd_mode_en << 26 | CSI_ENABLE_CROP_V1 | channel->vc << 8 | channel->data_type << 10 | @@ -7305,8 +7310,12 @@ unsigned int rkcif_irq_global(struct rkcif_device *cif_dev) unsigned int intstat_glb = 0; intstat_glb = rkcif_read_register(cif_dev, CIF_REG_GLB_INTST); - if (intstat_glb) + if (intstat_glb) { rkcif_write_register(cif_dev, CIF_REG_GLB_INTST, intstat_glb); + v4l2_dbg(3, rkcif_debug, &cif_dev->v4l2_dev, + "intstat_glb 0x%x\n", + intstat_glb); + } if (intstat_glb & SCALE_TOISP_AXI0_ERR) { v4l2_err(&cif_dev->v4l2_dev, @@ -7321,9 +7330,6 @@ unsigned int rkcif_irq_global(struct rkcif_device *cif_dev) return 0; } rkcif_irq_handle_scale(cif_dev, intstat_glb); - v4l2_dbg(3, rkcif_debug, &cif_dev->v4l2_dev, - "intstat_glb 0x%x\n", - intstat_glb); return intstat_glb; }