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

media: rockchip: cif: let all formats sampled with compact for rv1126

Browse Source 
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I3bfa4180a0e1c933a8a19553008b94fca869ec49
This commit is contained in:
Allon Huang
2020-07-24 20:06:55 +08:00
committed by Tao Huang
parent f70f859332
commit c4ac87b861
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}