From: Yoshihiro Kaneko <ykaneko0929@gmail.com>
To: linux-media@vger.kernel.org
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Simon Horman <horms@verge.net.au>,
Magnus Damm <magnus.damm@gmail.com>,
linux-sh@vger.kernel.org
Subject: [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support
Date: Tue, 14 Oct 2014 06:22:10 +0000 [thread overview]
Message-ID: <1413267730-8172-1-git-send-email-ykaneko0929@gmail.com> (raw)
In-Reply-To: <1387830486-10650-1-git-send-email-valentine.barshak@cogentembedded.com>
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
next prev parent reply other threads:[~2014-10-14 6:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-23 20:28 [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support Valentine Barshak
2013-12-26 14:18 ` Laurent Pinchart
2013-12-26 14:31 ` Valentine
2014-02-24 15:49 ` [PATCH] media: soc_camera: rcar_vin: Add support for 10-bit YUV cameras Phil Edworthy
2014-02-24 18:38 ` Laurent Pinchart
2014-02-25 9:10 ` [PATCH v2] " Phil Edworthy
2014-02-25 13:40 ` Vladimir Barinov
2014-02-25 13:40 ` [PATCH] " Valentine
2014-10-14 6:22 ` Yoshihiro Kaneko [this message]
2014-10-16 5:23 ` [PATCH] media: soc_camera: rcar_vin: Add BT.709 24-bit RGB888 input support Simon Horman
2014-10-18 14:55 ` Sergei Shtylyov
2014-10-14 6:24 ` [PATCH] media: soc_camera: rcar_vin: Add YUYV capture format support Yoshihiro Kaneko
2014-10-16 5:24 ` Simon Horman
2014-10-20 2:51 ` [PATCH] media: soc_camera: rcar_vin: Add DT support for r8a7793 and r8a7794 SoCs Yoshihiro Kaneko
2014-10-20 16:20 ` Simon Horman
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
2015-12-13 15:27 ` [PATCH] media: soc_camera: rcar_vin: Add R-Car Gen3 support Yoshihiro Kaneko
2015-12-13 17:43 ` Sergei Shtylyov
2015-12-20 9:52 ` Yoshihiro Kaneko
2016-01-09 10:46 ` Guennadi Liakhovetski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413267730-8172-1-git-send-email-ykaneko0929@gmail.com \
--to=ykaneko0929@gmail.com \
--cc=g.liakhovetski@gmx.de \
--cc=horms@verge.net.au \
--cc=linux-media@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).