* [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support
@ 2014-10-31 9:08 Yoshihiro Kaneko
2014-10-31 13:00 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Yoshihiro Kaneko @ 2014-10-31 9:08 UTC (permalink / raw)
To: linux-media; +Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
This patch is against master branch of linuxtv.org/media_tree.git.
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..18ce4bd 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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support
2014-10-31 9:08 [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support Yoshihiro Kaneko
@ 2014-10-31 13:00 ` Sergei Shtylyov
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2014-10-31 13:00 UTC (permalink / raw)
To: Yoshihiro Kaneko, linux-media
Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
Hello.
On 10/31/2014 12:08 PM, Yoshihiro Kaneko wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
> This patch is against master branch of linuxtv.org/media_tree.git.
> 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..18ce4bd 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
[...]
> @@ -331,6 +336,15 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
> if (output_is_yuv)
> vnmc |= VNMC_BPS;
>
> + /*
Please indent with a tab, not spaces.
> + * 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;
>
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support
@ 2014-10-14 6:22 Yoshihiro Kaneko
2014-10-16 5:23 ` Simon Horman
2014-10-18 14:55 ` Sergei Shtylyov
0 siblings, 2 replies; 5+ messages in thread
From: Yoshihiro Kaneko @ 2014-10-14 6:22 UTC (permalink / raw)
To: linux-media; +Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
This patch is against master branch of linuxtv.org/media_tree.git.
drivers/media/platform/soc_camera/rcar_vin.c | 10 ++++++++++
include/linux/platform_data/camera-rcar.h | 1 +
2 files changed, 11 insertions(+)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 20defcb..7eb4f1e 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -74,6 +74,8 @@
#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_INF_RGB_MASK (6 << 16)
#define VNMC_VUP (1 << 10)
#define VNMC_IM_ODD (0 << 3)
#define VNMC_IM_ODD_EVEN (1 << 3)
@@ -272,6 +274,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 +337,9 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
if (output_is_yuv)
vnmc |= VNMC_BPS;
+ if (vnmc & VNMC_INF_RGB_MASK)
+ vnmc ^= VNMC_BPS;
+
/* progressive or interlaced mode */
interrupts = progressive ? VNIE_FIE | VNIE_EFE : VNIE_EFE;
@@ -1013,6 +1022,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;
diff --git a/include/linux/platform_data/camera-rcar.h b/include/linux/platform_data/camera-rcar.h
index dfc83c5..03a9df6 100644
--- a/include/linux/platform_data/camera-rcar.h
+++ b/include/linux/platform_data/camera-rcar.h
@@ -17,6 +17,7 @@
#define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1)
#define RCAR_VIN_BT601 (1 << 2)
#define RCAR_VIN_BT656 (1 << 3)
+#define RCAR_VIN_BT709 (1 << 4)
struct rcar_vin_platform_data {
unsigned int flags;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support
2014-10-14 6:22 Yoshihiro Kaneko
@ 2014-10-16 5:23 ` Simon Horman
2014-10-18 14:55 ` Sergei Shtylyov
1 sibling, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-10-16 5:23 UTC (permalink / raw)
To: Yoshihiro Kaneko
Cc: linux-media, Guennadi Liakhovetski, Magnus Damm, linux-sh,
Mauro Carvalho Chehab
[CC Mauro Carvalho Chehab]
On Tue, Oct 14, 2014 at 03:22:10PM +0900, Yoshihiro Kaneko wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
>
> This patch is against master branch of linuxtv.org/media_tree.git.
Acked-by: Simon Horman <horms+renesas@verge.net.au>
If the series needs reposting to a different CC list -
e.g. including Mauro - please let Kaneko-san or myself know.
>
> drivers/media/platform/soc_camera/rcar_vin.c | 10 ++++++++++
> include/linux/platform_data/camera-rcar.h | 1 +
> 2 files changed, 11 insertions(+)
>
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index 20defcb..7eb4f1e 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
> @@ -74,6 +74,8 @@
> #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_INF_RGB_MASK (6 << 16)
> #define VNMC_VUP (1 << 10)
> #define VNMC_IM_ODD (0 << 3)
> #define VNMC_IM_ODD_EVEN (1 << 3)
> @@ -272,6 +274,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 +337,9 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
> if (output_is_yuv)
> vnmc |= VNMC_BPS;
>
> + if (vnmc & VNMC_INF_RGB_MASK)
> + vnmc ^= VNMC_BPS;
> +
> /* progressive or interlaced mode */
> interrupts = progressive ? VNIE_FIE | VNIE_EFE : VNIE_EFE;
>
> @@ -1013,6 +1022,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;
>
> diff --git a/include/linux/platform_data/camera-rcar.h b/include/linux/platform_data/camera-rcar.h
> index dfc83c5..03a9df6 100644
> --- a/include/linux/platform_data/camera-rcar.h
> +++ b/include/linux/platform_data/camera-rcar.h
> @@ -17,6 +17,7 @@
> #define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1)
> #define RCAR_VIN_BT601 (1 << 2)
> #define RCAR_VIN_BT656 (1 << 3)
> +#define RCAR_VIN_BT709 (1 << 4)
>
> struct rcar_vin_platform_data {
> unsigned int flags;
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support
2014-10-14 6:22 Yoshihiro Kaneko
2014-10-16 5:23 ` Simon Horman
@ 2014-10-18 14:55 ` Sergei Shtylyov
1 sibling, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2014-10-18 14:55 UTC (permalink / raw)
To: Yoshihiro Kaneko, linux-media
Cc: Guennadi Liakhovetski, Simon Horman, Magnus Damm, linux-sh
Hello.
On 10/14/2014 10:22 AM, Yoshihiro Kaneko wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
> ---
> This patch is against master branch of linuxtv.org/media_tree.git.
> drivers/media/platform/soc_camera/rcar_vin.c | 10 ++++++++++
> include/linux/platform_data/camera-rcar.h | 1 +
> 2 files changed, 11 insertions(+)
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
> index 20defcb..7eb4f1e 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
> @@ -74,6 +74,8 @@
> #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_INF_RGB_MASK (6 << 16)
I don't see why you direly need this mask; you could use VNMC_INF_RGB888.
[...]
> diff --git a/include/linux/platform_data/camera-rcar.h b/include/linux/platform_data/camera-rcar.h
> index dfc83c5..03a9df6 100644
> --- a/include/linux/platform_data/camera-rcar.h
> +++ b/include/linux/platform_data/camera-rcar.h
> @@ -17,6 +17,7 @@
> #define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1)
> #define RCAR_VIN_BT601 (1 << 2)
> #define RCAR_VIN_BT656 (1 << 3)
> +#define RCAR_VIN_BT709 (1 << 4)
I don't see where it's used...
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-10-31 13:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-31 9:08 [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support Yoshihiro Kaneko
2014-10-31 13:00 ` Sergei Shtylyov
-- strict thread matches above, loose matches on Subject: below --
2014-10-14 6:22 Yoshihiro Kaneko
2014-10-16 5:23 ` Simon Horman
2014-10-18 14:55 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).