media: imx: interweave and odd-chroma-row skip are incompatible

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>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 1a03d4c..cf76b04 100644 (file)
--- 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 10945cb..604d0bd 100644 (file)
--- 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: