From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
To: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
linux-media@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH v3 3/4] rcar-vin: Add support for RGB formats with alpha component
Date: Thu, 4 Jul 2019 16:50:11 +0100 [thread overview]
Message-ID: <e5e86b42-b53e-ccf1-211a-4b5551a03125@ideasonboard.com> (raw)
In-Reply-To: <20190704015817.17083-4-niklas.soderlund+renesas@ragnatech.se>
Hi Niklas,
On 04/07/2019 02:58, Niklas Söderlund wrote:
> The R-Car VIN module supports V4L2_PIX_FMT_ARGB555 and
> V4L2_PIX_FMT_ABGR32 pixel formats. Add the hardware register setup and
> allow the alpha component to be changed while streaming using the
> V4L2_CID_ALPHA_COMPONENT control.
Hrm, I expected there to be more ARGB formats supported, but the Gen3
datasheet does seem to indicate only the two.
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
> ---
> drivers/media/platform/rcar-vin/rcar-dma.c | 35 +++++++++++++++++++++
> drivers/media/platform/rcar-vin/rcar-v4l2.c | 8 +++++
> 2 files changed, 43 insertions(+)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c
> index 4e991cce5fb56a90..620976d173585694 100644
> --- a/drivers/media/platform/rcar-vin/rcar-dma.c
> +++ b/drivers/media/platform/rcar-vin/rcar-dma.c
> @@ -111,8 +111,11 @@
> #define VNIE_EFE (1 << 1)
>
> /* Video n Data Mode Register bits */
> +#define VNDMR_A8BIT(n) ((n & 0xff) << 24)
> +#define VNDMR_A8BIT_MASK (0xff << 24)
> #define VNDMR_EXRGB (1 << 8)
> #define VNDMR_BPSM (1 << 4)
> +#define VNDMR_ABIT (1 << 2)
> #define VNDMR_DTMD_YCSEP (1 << 1)
> #define VNDMR_DTMD_ARGB (1 << 0)
>
> @@ -730,6 +733,12 @@ static int rvin_setup(struct rvin_dev *vin)
> /* Note: not supported on M1 */
> dmr = VNDMR_EXRGB;
> break;
> + case V4L2_PIX_FMT_ARGB555:
> + dmr = (vin->alpha ? VNDMR_ABIT : 0) | VNDMR_DTMD_ARGB;
> + break;
> + case V4L2_PIX_FMT_ABGR32:
> + dmr = VNDMR_A8BIT(vin->alpha) | VNDMR_EXRGB | VNDMR_DTMD_ARGB;
> + break;
> default:
> vin_err(vin, "Invalid pixelformat (0x%x)\n",
> vin->format.pixelformat);
> @@ -1346,5 +1355,31 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel)
>
> void rvin_set_alpha(struct rvin_dev *vin, unsigned int alpha)
> {
> + unsigned long flags;
> + u32 dmr;
> +
> + spin_lock_irqsave(&vin->qlock, flags);
> +
> vin->alpha = alpha;
> +
> + if (vin->state == STOPPED)
> + goto out;
> +
> + switch (vin->format.pixelformat) {
> + case V4L2_PIX_FMT_ARGB555:
> + dmr = rvin_read(vin, VNDMR_REG) & ~VNDMR_ABIT;
> + if (vin->alpha)
> + dmr |= VNDMR_ABIT;
> + break;
> + case V4L2_PIX_FMT_ABGR32:
> + dmr = rvin_read(vin, VNDMR_REG) & ~VNDMR_A8BIT_MASK;
> + dmr |= VNDMR_A8BIT(vin->alpha);
> + break;
> + default:
> + goto out;
> + }
> +
> + rvin_write(vin, dmr, VNDMR_REG);
> +out:
> + spin_unlock_irqrestore(&vin->qlock, flags);
> }
> diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> index 0936bcd98df1f75d..f8b6ec4408b2f5fa 100644
> --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
> +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
> @@ -54,6 +54,14 @@ static const struct rvin_video_format rvin_formats[] = {
> .fourcc = V4L2_PIX_FMT_XBGR32,
> .bpp = 4,
> },
> + {
> + .fourcc = V4L2_PIX_FMT_ARGB555,
> + .bpp = 2,
> + },
> + {
> + .fourcc = V4L2_PIX_FMT_ABGR32,
> + .bpp = 4,
> + },
> };
>
> const struct rvin_video_format *rvin_format_from_pixel(u32 pixelformat)
>
next prev parent reply other threads:[~2019-07-04 15:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 1:58 [PATCH v3 0/4] rcar-vin: Add support for RGB formats with alpha Niklas Söderlund
2019-07-04 1:58 ` [PATCH v3 1/4] rcar-vin: Rename VNDMR_DTMD_ARGB1555 to VNDMR_DTMD_ARGB Niklas Söderlund
2019-07-04 14:13 ` Kieran Bingham
2019-07-04 1:58 ` [PATCH v3 2/4] rcar-vin: Add control for alpha component Niklas Söderlund
2019-07-04 15:15 ` Kieran Bingham
2019-07-04 15:35 ` Niklas Söderlund
2019-07-04 1:58 ` [PATCH v3 3/4] rcar-vin: Add support for RGB formats with " Niklas Söderlund
2019-07-04 12:14 ` Laurent Pinchart
2019-07-04 15:50 ` Kieran Bingham [this message]
2019-07-04 1:58 ` [PATCH v3 4/4] rcar-vin: Always setup controls when opening video device Niklas Söderlund
2019-07-04 12:16 ` Laurent Pinchart
2019-07-04 15:55 ` Kieran Bingham
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=e5e86b42-b53e-ccf1-211a-4b5551a03125@ideasonboard.com \
--to=kieran.bingham+renesas@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund+renesas@ragnatech.se \
/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).