From c4ac87b8612a9ea9310b7d47fa41109825de67d9 Mon Sep 17 00:00:00 2001 From: Allon Huang Date: Fri, 24 Jul 2020 20:06:55 +0800 Subject: [PATCH] media: rockchip: cif: let all formats sampled with compact for rv1126 Signed-off-by: Allon Huang Change-Id: I3bfa4180a0e1c933a8a19553008b94fca869ec49 --- drivers/media/platform/rockchip/cif/capture.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 7fb662d789d8..5ec32cb9e4fb 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -1298,7 +1298,9 @@ static int rkcif_csi_channel_init(struct rkcif_stream *stream, * needs aligned with :ALIGN(bits_per_pixel * width / 8, 8), if enable 16bit mode * needs aligned with :ALIGN(bits_per_pixel * width * 2, 8) */ - if (dev->hdr.mode == NO_HDR) { + if (dev->hdr.mode == NO_HDR && + dev->chip_id != CHIP_RV1126_CIF && + dev->chip_id != CHIP_RV1126_CIF_LITE) { if (channel->fmt_val == CSI_WRDDR_TYPE_RAW10 || channel->fmt_val == CSI_WRDDR_TYPE_RAW12) channel->virtual_width = ALIGN(channel->width * 2, 8); @@ -1413,7 +1415,8 @@ static int rkcif_csi_channel_set(struct rkcif_stream *stream, channel->cmd_mode_en << 4 | channel->crop_en << 5 | channel->id << 8 | channel->data_type << 10; - if (dev->hdr.mode != NO_HDR) + if (dev->chip_id == CHIP_RV1126_CIF || + dev->chip_id == CHIP_RV1126_CIF_LITE) val |= CSI_ENABLE_MIPI_COMPACT; } else if (mbus_type == V4L2_MBUS_CCP2) { rkcif_csi_set_lvds_sav_eav(stream, channel); @@ -1421,7 +1424,8 @@ static int rkcif_csi_channel_set(struct rkcif_stream *stream, LVDS_MAIN_LANE(0) | LVDS_FID(0) | LVDS_LANES_ENABLED(dev->active_sensor->lanes); - if (dev->hdr.mode != NO_HDR) + if (dev->chip_id == CHIP_RV1126_CIF || + dev->chip_id == CHIP_RV1126_CIF_LITE) val |= LVDS_COMPACT; }