From: Steve Longerbeam <slongerbeam@gmail.com> To: linux-media@vger.kernel.org Cc: Tim Harvey <tharvey@gateworks.com>, Steve Longerbeam <slongerbeam@gmail.com>, Philipp Zabel <p.zabel@pengutronix.de>, dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR FREESCALE IMX), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 2/4] gpu: ipu-v3: ipu-ic: Simplify selection of encoding matrix Date: Fri, 8 Feb 2019 17:47:46 -0800 [thread overview] Message-ID: <20190209014748.10427-3-slongerbeam@gmail.com> (raw) In-Reply-To: <20190209014748.10427-1-slongerbeam@gmail.com> Simplify the selection of the Y'CbCr encoding matrices in init_csc(). A side-effect of this change is that init_csc() now allows YUV->YUV using the identity matrix, intead of returning error. Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> --- drivers/gpu/ipu-v3/ipu-ic.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/ipu-v3/ipu-ic.c index 3ef61f0b509b..e459615a49a1 100644 --- a/drivers/gpu/ipu-v3/ipu-ic.c +++ b/drivers/gpu/ipu-v3/ipu-ic.c @@ -244,16 +244,12 @@ static int init_csc(struct ipu_ic *ic, base = (u32 __iomem *) (priv->tpmem_base + ic->reg->tpmem_csc[csc_index]); - if (inf == IPUV3_COLORSPACE_YUV && outf == IPUV3_COLORSPACE_RGB) + if (inf == outf) + params = &ic_csc_identity; + else if (inf == IPUV3_COLORSPACE_YUV) params = &ic_csc_ycbcr2rgb_bt601; - else if (inf == IPUV3_COLORSPACE_RGB && outf == IPUV3_COLORSPACE_YUV) + else params = &ic_csc_rgb2ycbcr_bt601; - else if (inf == IPUV3_COLORSPACE_RGB && outf == IPUV3_COLORSPACE_RGB) - params = &ic_csc_identity; - else { - dev_err(priv->ipu->dev, "Unsupported color space conversion\n"); - return -EINVAL; - } /* Cast to unsigned */ c = (const u16 (*)[3])params->coeff; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Steve Longerbeam <slongerbeam@gmail.com> To: linux-media@vger.kernel.org Cc: Tim Harvey <tharvey@gateworks.com>, Steve Longerbeam <slongerbeam@gmail.com>, Philipp Zabel <p.zabel@pengutronix.de>, "open list:DRM DRIVERS FOR FREESCALE IMX" <dri-devel@lists.freedesktop.org>, open list <linux-kernel@vger.kernel.org> Subject: [PATCH v4 2/4] gpu: ipu-v3: ipu-ic: Simplify selection of encoding matrix Date: Fri, 8 Feb 2019 17:47:46 -0800 [thread overview] Message-ID: <20190209014748.10427-3-slongerbeam@gmail.com> (raw) In-Reply-To: <20190209014748.10427-1-slongerbeam@gmail.com> Simplify the selection of the Y'CbCr encoding matrices in init_csc(). A side-effect of this change is that init_csc() now allows YUV->YUV using the identity matrix, intead of returning error. Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> --- drivers/gpu/ipu-v3/ipu-ic.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/ipu-v3/ipu-ic.c index 3ef61f0b509b..e459615a49a1 100644 --- a/drivers/gpu/ipu-v3/ipu-ic.c +++ b/drivers/gpu/ipu-v3/ipu-ic.c @@ -244,16 +244,12 @@ static int init_csc(struct ipu_ic *ic, base = (u32 __iomem *) (priv->tpmem_base + ic->reg->tpmem_csc[csc_index]); - if (inf == IPUV3_COLORSPACE_YUV && outf == IPUV3_COLORSPACE_RGB) + if (inf == outf) + params = &ic_csc_identity; + else if (inf == IPUV3_COLORSPACE_YUV) params = &ic_csc_ycbcr2rgb_bt601; - else if (inf == IPUV3_COLORSPACE_RGB && outf == IPUV3_COLORSPACE_YUV) + else params = &ic_csc_rgb2ycbcr_bt601; - else if (inf == IPUV3_COLORSPACE_RGB && outf == IPUV3_COLORSPACE_RGB) - params = &ic_csc_identity; - else { - dev_err(priv->ipu->dev, "Unsupported color space conversion\n"); - return -EINVAL; - } /* Cast to unsigned */ c = (const u16 (*)[3])params->coeff; -- 2.17.1
next prev parent reply other threads:[~2019-02-09 1:48 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-09 1:47 [PATCH v4 0/4] media: imx: Add support for BT.709 encoding Steve Longerbeam 2019-02-09 1:47 ` [PATCH v4 1/4] gpu: ipu-v3: ipu-ic: Rename yuv2rgb encoding matrices Steve Longerbeam 2019-02-09 1:47 ` Steve Longerbeam 2019-02-11 9:58 ` Philipp Zabel 2019-02-11 9:58 ` Philipp Zabel 2019-02-11 18:24 ` Steve Longerbeam 2019-02-11 18:24 ` Steve Longerbeam 2019-02-12 10:17 ` Philipp Zabel 2019-02-12 10:17 ` Philipp Zabel 2019-02-12 17:42 ` Steve Longerbeam 2019-02-12 17:42 ` Steve Longerbeam 2019-02-13 10:35 ` Philipp Zabel 2019-02-13 10:35 ` Philipp Zabel 2019-02-14 18:54 ` Steve Longerbeam 2019-02-14 18:54 ` Steve Longerbeam 2019-02-11 23:33 ` Steve Longerbeam 2019-02-11 23:33 ` Steve Longerbeam 2019-02-09 1:47 ` Steve Longerbeam [this message] 2019-02-09 1:47 ` [PATCH v4 2/4] gpu: ipu-v3: ipu-ic: Simplify selection of encoding matrix Steve Longerbeam 2019-02-11 10:00 ` Philipp Zabel 2019-02-11 10:00 ` Philipp Zabel 2019-02-09 1:47 ` [PATCH v4 3/4] gpu: ipu-v3: ipu-ic: Add support for BT.709 encoding Steve Longerbeam 2019-02-09 1:47 ` Steve Longerbeam 2019-02-09 1:47 ` Steve Longerbeam 2019-02-11 10:12 ` Philipp Zabel 2019-02-11 10:12 ` Philipp Zabel 2019-02-11 10:12 ` Philipp Zabel 2019-02-12 1:20 ` Steve Longerbeam 2019-02-12 1:20 ` Steve Longerbeam 2019-02-12 1:20 ` Steve Longerbeam 2019-02-12 11:34 ` Philipp Zabel 2019-02-12 11:34 ` Philipp Zabel 2019-02-12 11:34 ` Philipp Zabel 2019-02-12 17:50 ` Steve Longerbeam 2019-02-12 17:50 ` Steve Longerbeam 2019-02-12 17:50 ` Steve Longerbeam 2019-02-09 1:47 ` [PATCH v4 4/4] media: imx: Allow BT.709 encoding for IC routes Steve Longerbeam
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=20190209014748.10427-3-slongerbeam@gmail.com \ --to=slongerbeam@gmail.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=p.zabel@pengutronix.de \ --cc=tharvey@gateworks.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.