From: Steve Longerbeam <slongerbeam@gmail.com>
To: linux-media@vger.kernel.org
Cc: Steve Longerbeam <slongerbeam@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v6 07/12] media: imx: interweave and odd-chroma-row skip are incompatible
Date: Tue, 8 Jan 2019 16:15:46 -0800 [thread overview]
Message-ID: <20190109001551.16113-8-slongerbeam@gmail.com> (raw)
In-Reply-To: <20190109001551.16113-1-slongerbeam@gmail.com>
If IDMAC interweaving is enabled in a write channel, the channel must
write the odd chroma rows for 4:2:0 formats. Skipping writing the odd
chroma rows produces corrupted captured 4:2:0 images when interweave
is enabled.
Reported-by: Krzysztof Hałasa <khalasa@piap.pl>
Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/staging/media/imx/imx-ic-prpencvf.c | 9 +++++++--
drivers/staging/media/imx/imx-media-csi.c | 8 ++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 1a03d4c9d7b8..cf76b0432371 100644
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -391,12 +391,17 @@ static int prp_setup_channel(struct prp_priv *priv,
image.phys0 = addr0;
image.phys1 = addr1;
- if (channel == priv->out_ch || channel == priv->rot_out_ch) {
+ /*
+ * Skip writing U and V components to odd rows in the output
+ * channels for planar 4:2:0 (but not when enabling IDMAC
+ * interweaving, they are incompatible).
+ */
+ if (!interweave && (channel == priv->out_ch ||
+ channel == priv->rot_out_ch)) {
switch (image.pix.pixelformat) {
case V4L2_PIX_FMT_YUV420:
case V4L2_PIX_FMT_YVU420:
case V4L2_PIX_FMT_NV12:
- /* Skip writing U and V components to odd rows */
ipu_cpmem_skip_odd_chroma_rows(channel);
break;
}
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index c40c3262038e..dbc5a92ec073 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -457,8 +457,12 @@ static int csi_idmac_setup_channel(struct csi_priv *priv)
((image.pix.width & 0x1f) ?
((image.pix.width & 0xf) ? 8 : 16) : 32) : 64;
passthrough_bits = 16;
- /* Skip writing U and V components to odd rows */
- ipu_cpmem_skip_odd_chroma_rows(priv->idmac_ch);
+ /*
+ * Skip writing U and V components to odd rows (but not
+ * when enabling IDMAC interweaving, they are incompatible).
+ */
+ if (!interweave)
+ ipu_cpmem_skip_odd_chroma_rows(priv->idmac_ch);
break;
case V4L2_PIX_FMT_YUYV:
case V4L2_PIX_FMT_UYVY:
--
2.17.1
next prev parent reply other threads:[~2019-01-09 0:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190109001551.16113-1-slongerbeam@gmail.com>
2019-01-09 0:15 ` [PATCH v6 01/12] media: videodev2.h: Add more field helper macros Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 02/12] gpu: ipu-csi: Swap fields according to input/output field types Steve Longerbeam
2019-01-09 11:11 ` Philipp Zabel
2019-01-09 0:15 ` [PATCH v6 03/12] gpu: ipu-v3: Add planar support to interlaced scan Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 04/12] media: imx: Fix field negotiation Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 05/12] media: imx-csi: Input connections to CSI should be optional Steve Longerbeam
2019-01-09 11:13 ` Philipp Zabel
2019-01-09 17:26 ` Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 06/12] media: imx-csi: Double crop height for alternate fields at sink Steve Longerbeam
2019-01-09 0:15 ` Steve Longerbeam [this message]
2019-01-09 0:15 ` [PATCH v6 08/12] media: imx-csi: Allow skipping odd chroma rows for YVU420 Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 09/12] media: imx: vdic: rely on VDIC for correct field order Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 10/12] media: imx-csi: Move crop/compose reset after filling default mbus fields Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 11/12] media: imx: Allow interweave with top/bottom lines swapped Steve Longerbeam
2019-01-09 0:15 ` [PATCH v6 12/12] media: imx.rst: Update doc to reflect fixes to interlaced capture Steve Longerbeam
2019-01-09 11:16 ` Philipp Zabel
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=20190109001551.16113-8-slongerbeam@gmail.com \
--to=slongerbeam@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=p.zabel@pengutronix.de \
/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).