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

media: rockchip/cif: support input raw/y format

Browse Source 
dvp input raw/y, will output 16bit per pixel,
so output format shuold be raw16/y16.

Change-Id: I13e05ebe62b8802fa3a4c51f603c420e8127b929
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2019-01-28 16:22:12 +08:00
committed by Tao Huang
parent 186812abcc
commit 95ea71a61c
2 changed files with 95 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,17 @@ static const struct cif_output_fmt out_fmts[] = {
.cplanes = 1,
.mplanes = 1,
.bpp = { 16 },
},
}, {
.fourcc = V4L2_PIX_FMT_SBGGR16,
.cplanes = 1,
.mplanes = 1,
.bpp = { 16 },
}, {
.fourcc = V4L2_PIX_FMT_Y16,
.cplanes = 1,
.mplanes = 1,
.bpp = { 16 },
}
/* TODO: We can support NV12M/NV21M/NV16M/NV61M too */
};
@@ -170,97 +180,147 @@ static const struct cif_output_fmt out_fmts[] = {
static const struct cif_input_fmt in_fmts[] = {
{
.mbus_code = MEDIA_BUS_FMT_YUYV8_2X8,
.fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_YUYV,
.dvp_fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_YUYV,
.csi_fmt_val = CSI_WRDDR_TYPE_YUV422,
.fmt_type = CIF_FMT_TYPE_YUV,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_YUYV8_2X8,
.fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_YUYV,
.dvp_fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_YUYV,
.csi_fmt_val = CSI_WRDDR_TYPE_YUV422,
.fmt_type = CIF_FMT_TYPE_YUV,
.field = V4L2_FIELD_INTERLACED,
}, {
.mbus_code = MEDIA_BUS_FMT_YVYU8_2X8,
.fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_YVYU,
.dvp_fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_YVYU,
.csi_fmt_val = CSI_WRDDR_TYPE_YUV422,
.fmt_type = CIF_FMT_TYPE_YUV,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_YVYU8_2X8,
.fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_YVYU,
.dvp_fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_YVYU,
.csi_fmt_val = CSI_WRDDR_TYPE_YUV422,
.fmt_type = CIF_FMT_TYPE_YUV,
.field = V4L2_FIELD_INTERLACED,
}, {
.mbus_code = MEDIA_BUS_FMT_UYVY8_2X8,
.fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_UYVY,
.dvp_fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_UYVY,
.csi_fmt_val = CSI_WRDDR_TYPE_YUV422,
.fmt_type = CIF_FMT_TYPE_YUV,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_UYVY8_2X8,
.fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_UYVY,
.dvp_fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_UYVY,
.csi_fmt_val = CSI_WRDDR_TYPE_YUV422,
.fmt_type = CIF_FMT_TYPE_YUV,
.field = V4L2_FIELD_INTERLACED,
}, {
.mbus_code = MEDIA_BUS_FMT_VYUY8_2X8,
.fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_VYUY,
.dvp_fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_VYUY,
.csi_fmt_val = CSI_WRDDR_TYPE_YUV422,
.fmt_type = CIF_FMT_TYPE_YUV,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_VYUY8_2X8,
.fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_VYUY,
.dvp_fmt_val = YUV_INPUT_422 | YUV_INPUT_ORDER_VYUY,
.csi_fmt_val = CSI_WRDDR_TYPE_YUV422,
.fmt_type = CIF_FMT_TYPE_YUV,
.field = V4L2_FIELD_INTERLACED,
}, {
.mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8,
.fmt_val = CSI_WRDDR_TYPE_RAW8,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_8,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW8,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8,
.fmt_val = CSI_WRDDR_TYPE_RAW8,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_8,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW8,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8,
.fmt_val = CSI_WRDDR_TYPE_RAW8,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_8,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW8,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8,
.fmt_val = CSI_WRDDR_TYPE_RAW8,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_8,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW8,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10,
.fmt_val = CSI_WRDDR_TYPE_RAW10,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_10,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW10,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10,
.fmt_val = CSI_WRDDR_TYPE_RAW10,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_10,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW10,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10,
.fmt_val = CSI_WRDDR_TYPE_RAW10,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_10,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW10,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10,
.fmt_val = CSI_WRDDR_TYPE_RAW10,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_10,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW10,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12,
.fmt_val = CSI_WRDDR_TYPE_RAW12,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_12,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW12,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12,
.fmt_val = CSI_WRDDR_TYPE_RAW12,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_12,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW12,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12,
.fmt_val = CSI_WRDDR_TYPE_RAW12,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_12,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW12,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12,
.fmt_val = CSI_WRDDR_TYPE_RAW12,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_12,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW12,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_RGB888_1X24,
.fmt_val = CSI_WRDDR_TYPE_RGB888,
.csi_fmt_val = CSI_WRDDR_TYPE_RGB888,
.field = V4L2_FIELD_NONE,
},
}, {
.mbus_code = MEDIA_BUS_FMT_Y8_1X8,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_8,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW8,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_Y10_1X10,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_10,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW10,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}, {
.mbus_code = MEDIA_BUS_FMT_Y12_1X12,
.dvp_fmt_val = INPUT_MODE_RAW | RAW_DATA_WIDTH_12,
.csi_fmt_val = CSI_WRDDR_TYPE_RAW12,
.fmt_type = CIF_FMT_TYPE_RAW,
.field = V4L2_FIELD_NONE,
}
};
/* Get active sensor by enabled media link */
@@ -315,7 +375,7 @@ static unsigned char get_data_type(u32 pixelformat, u8 cmd_mode_en)
static int get_csi_crop_align(const struct cif_input_fmt *fmt_in)
{
switch (fmt_in->fmt_val) {
switch (fmt_in->csi_fmt_val) {
case CSI_WRDDR_TYPE_RGB888:
return 24;
case CSI_WRDDR_TYPE_RAW10:
@@ -564,7 +624,7 @@ static int rkcif_csi_channel_init(struct rkcif_stream *stream,
channel->enable = 1;
channel->width = stream->pixm.width;
channel->height = stream->pixm.height;
channel->fmt_val = stream->cif_fmt_in->fmt_val;
channel->fmt_val = stream->cif_fmt_in->csi_fmt_val;
channel->cmd_mode_en = 0; /* default use DSI Video Mode */
if (stream->crop_enable) {
@@ -946,15 +1006,18 @@ static int rkcif_stream_start(struct rkcif_stream *stream)
xfer_mode = BT1120_TRANSMIT_PROGRESS;
else
xfer_mode = BT1120_TRANSMIT_INTERFACE;
if (!CIF_FETCH_IS_Y_FIRST(stream->cif_fmt_in->fmt_val))
if (!CIF_FETCH_IS_Y_FIRST(stream->cif_fmt_in->dvp_fmt_val))
yc_swap = BT1120_YC_SWAP;
}
val = vsync_pol | href_pol | rkcif_determine_input_mode(dev) |
stream->cif_fmt_out->fmt_val | stream->cif_fmt_in->fmt_val |
stream->cif_fmt_out->fmt_val | stream->cif_fmt_in->dvp_fmt_val |
xfer_mode | yc_swap;
write_cif_reg(base, CIF_FOR, val);
write_cif_reg(base, CIF_VIR_LINE_WIDTH, stream->pixm.width);
val = stream->pixm.width;
if (stream->cif_fmt_in->fmt_type == CIF_FMT_TYPE_RAW)
val = stream->pixm.width * 2;
write_cif_reg(base, CIF_VIR_LINE_WIDTH, val);
write_cif_reg(base, CIF_SET_SIZE,
stream->pixm.width | (stream->pixm.height << 16));

6
drivers/media/platform/rockchip/cif/dev.h
View File

@@ -108,12 +108,14 @@ enum cif_fmt_type {
* struct cif_input_fmt - The input mbus format from sensor
*
* @mbus_code: mbus format
* @fmt_val: the fmt val corresponding to CIF_FOR register
* @dvp_fmt_val: the fmt val corresponding to CIF_FOR register
* @csi_fmt_val: the fmt val corresponding to CIF_CSI_ID_CTRL
* @field: the field type of the input from sensor
*/
struct cif_input_fmt {
u32 mbus_code;
u32 fmt_val;
u32 dvp_fmt_val;
u32 csi_fmt_val;
enum cif_fmt_type fmt_type;
enum v4l2_field field;
};