|
@@ -98,6 +98,7 @@
|
|
|
#define VNMC_INF_YUV10_BT656 (2 << 16)
|
|
|
#define VNMC_INF_YUV10_BT601 (3 << 16)
|
|
|
#define VNMC_INF_YUV16 (5 << 16)
|
|
|
+#define VNMC_INF_RGB888 (6 << 16)
|
|
|
#define VNMC_VUP (1 << 10)
|
|
|
#define VNMC_IM_ODD (0 << 3)
|
|
|
#define VNMC_IM_ODD_EVEN (1 << 3)
|
|
@@ -589,7 +590,7 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
|
|
|
struct soc_camera_device *icd = priv->ici.icd;
|
|
|
struct rcar_vin_cam *cam = icd->host_priv;
|
|
|
u32 vnmc, dmr, interrupts;
|
|
|
- bool progressive = false, output_is_yuv = false;
|
|
|
+ bool progressive = false, output_is_yuv = false, input_is_yuv = false;
|
|
|
|
|
|
switch (priv->field) {
|
|
|
case V4L2_FIELD_TOP:
|
|
@@ -623,16 +624,22 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
|
|
|
case MEDIA_BUS_FMT_YUYV8_1X16:
|
|
|
/* BT.601/BT.1358 16bit YCbCr422 */
|
|
|
vnmc |= VNMC_INF_YUV16;
|
|
|
+ input_is_yuv = true;
|
|
|
break;
|
|
|
case MEDIA_BUS_FMT_YUYV8_2X8:
|
|
|
/* BT.656 8bit YCbCr422 or BT.601 8bit YCbCr422 */
|
|
|
vnmc |= priv->pdata_flags & RCAR_VIN_BT656 ?
|
|
|
VNMC_INF_YUV8_BT656 : VNMC_INF_YUV8_BT601;
|
|
|
+ input_is_yuv = true;
|
|
|
+ break;
|
|
|
+ case MEDIA_BUS_FMT_RGB888_1X24:
|
|
|
+ vnmc |= VNMC_INF_RGB888;
|
|
|
break;
|
|
|
case MEDIA_BUS_FMT_YUYV10_2X10:
|
|
|
/* BT.656 10bit YCbCr422 or BT.601 10bit YCbCr422 */
|
|
|
vnmc |= priv->pdata_flags & RCAR_VIN_BT656 ?
|
|
|
VNMC_INF_YUV10_BT656 : VNMC_INF_YUV10_BT601;
|
|
|
+ input_is_yuv = true;
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
@@ -676,7 +683,7 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
|
|
|
vnmc |= VNMC_VUP;
|
|
|
|
|
|
/* If input and output use the same colorspace, use bypass mode */
|
|
|
- if (output_is_yuv)
|
|
|
+ if (input_is_yuv == output_is_yuv)
|
|
|
vnmc |= VNMC_BPS;
|
|
|
|
|
|
/* progressive or interlaced mode */
|
|
@@ -1423,6 +1430,7 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx,
|
|
|
case MEDIA_BUS_FMT_YUYV8_1X16:
|
|
|
case MEDIA_BUS_FMT_YUYV8_2X8:
|
|
|
case MEDIA_BUS_FMT_YUYV10_2X10:
|
|
|
+ case MEDIA_BUS_FMT_RGB888_1X24:
|
|
|
if (cam->extra_fmt)
|
|
|
break;
|
|
|
|