On Sat, Nov 01, 2014 at 12:06:38AM +0900, Yoshihiro Kaneko wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx>
>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@xxxxxxxxxxx>
> Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@xxxxxxxxx>
Hi Guennadi,
this patch has been through a few revisions but this one seems
to make the reviewers happy. Could you take a look at it when you have
a chance?
> ---
>
> This patch is against master branch of linuxtv.org/media_tree.git.
>
> v4 [Yoshihiro Kaneko]
> * indent with a tab, not with spaces
>
> v3 [Yoshihiro Kaneko]
> * fixes the detection of RGB input
>
> v2 [Yoshihiro Kaneko]
> * remove unused definition as suggested by Sergei Shtylyov
> * use VNMC_INF_RGB888 directly instead of VNMC_INF_RGB_MASK as a bit-field
> mask
>
> drivers/media/platform/soc_camera/rcar_vin.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index 20defcb..7becec0 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
> @@ -74,6 +74,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)
> @@ -272,6 +273,10 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
>
> /* input interface */
> switch (icd->current_fmt->code) {
> + case V4L2_MBUS_FMT_RGB888_1X24:
> + /* BT.601/BT.709 24-bit RGB-888 */
> + vnmc |= VNMC_INF_RGB888;
> + break;
> case V4L2_MBUS_FMT_YUYV8_1X16:
> /* BT.601/BT.1358 16bit YCbCr422 */
> vnmc |= VNMC_INF_YUV16;
> @@ -331,6 +336,15 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
> if (output_is_yuv)
> vnmc |= VNMC_BPS;
>
> + /*
> + * The above assumes YUV input, toggle BPS for RGB input.
> + * RGB inputs can be detected by checking that the most-significant
> + * two bits of INF are set. This corresponds to the bits
> + * set in VNMC_INF_RGB888.
> + */
> + if ((vnmc & VNMC_INF_RGB888) == VNMC_INF_RGB888)
> + vnmc ^= VNMC_BPS;
> +
> /* progressive or interlaced mode */
> interrupts = progressive ? VNIE_FIE | VNIE_EFE : VNIE_EFE;
>
> @@ -1013,6 +1027,7 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx,
> case V4L2_MBUS_FMT_YUYV8_1X16:
> case V4L2_MBUS_FMT_YUYV8_2X8:
> case V4L2_MBUS_FMT_YUYV10_2X10:
> + case V4L2_MBUS_FMT_RGB888_1X24:
> if (cam->extra_fmt)
> break;
>
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
