From patchwork Wed Oct 17 00:00:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 10644435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F26B917D4 for ; Wed, 17 Oct 2018 00:00:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E315728F80 for ; Wed, 17 Oct 2018 00:00:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D78E62A518; Wed, 17 Oct 2018 00:00:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A57A28F80 for ; Wed, 17 Oct 2018 00:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727689AbeJQHxl (ORCPT ); Wed, 17 Oct 2018 03:53:41 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:34398 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727569AbeJQHxj (ORCPT ); Wed, 17 Oct 2018 03:53:39 -0400 Received: by mail-pl1-f194.google.com with SMTP id f18-v6so11767655plr.1; Tue, 16 Oct 2018 17:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U0eBTHkSaCphcPmwZ9jVlJ6HcB3DsZnUr5R1VmafRFY=; b=bKk3VSpVvrlANGtQ0CXXAEUKnZHRBbLi25e9GeqBgRiieQnGfLp5opYGWCA7SvEI+l tGm6IxWY6SCFGD0JMCbigX4aZH4dbZZDDBiuTo9MIzkUpaqlIh20LVAs1a2pxBZ0eeYz OkCeg8FvNAb9y0EhTkdDVYVfDOTJzIwnhPBkXWWEhd/UNffdm5/baKXkXlwRd90ftC6W jAfC8/kgZTOCBDlsJHSAHeiPybsXduhyX9GzbPCZpA3+NNUaxRpbvJiGgdYMcsmjBG8u IAUX9zKTpVmnHKlOLTie8eGYOhV/+kj8sGNpBn2pOhIDXgDP1mWX5UaJOagl+YGGSjSN rhOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U0eBTHkSaCphcPmwZ9jVlJ6HcB3DsZnUr5R1VmafRFY=; b=XgKcjMzWR621jbBfMm4CnD/oYXon0bzMJqrn8yjCnGekqE/R0n/37WZdWDtZ5kag7v 8ZFi0DPwYdCjjBdqo9eBhTnkh/i4dDFxwTjSOnM6krt2XPBmzVkOBS02j7c4K/4IJSCv Q/Mp6wMyMx2Kmvjox9jOm0Ud1j8QaxtCK4w7GCxi4B5Heu+fOh4ZJ8S6aRYrAG6H20By bOCHGEOlokIwGdqh+Km5J0vV/VnEFAp7YGuSbsl+SPiAPp5d1R4ZTk3HjXPRQGxQeOUK rrq6PD6QxlCCmQONw214My3D69wCi0sfZ99b/XTbjekofABJPmQdNNTswtnJ/DnRUjFp loTA== X-Gm-Message-State: ABuFfogYQ4no+/myWOKdxYGjWZS2Y19pax5uWYEzi9k9QASeFedPcLiK KT4kXY3Y1ipIYoZgFOiea+K4D3YF X-Google-Smtp-Source: ACcGV60yhOyX69rEqScgU2+HCyIBA9TIcWXnJisJvPF7k11Xc+/qWF0/Rix05C2vnM3xVvIksQzWkA== X-Received: by 2002:a17:902:3204:: with SMTP id y4-v6mr18584456plb.135.1539734448006; Tue, 16 Oct 2018 17:00:48 -0700 (PDT) Received: from majic.sklembedded.com (c-98-210-181-167.hsd1.ca.comcast.net. [98.210.181.167]) by smtp.googlemail.com with ESMTPSA id o12-v6sm17033117pgv.7.2018.10.16.17.00.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Oct 2018 17:00:47 -0700 (PDT) From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , devel@driverdev.osuosl.org (open list:STAGING SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 07/12] media: imx: interweave and odd-chroma-row skip are incompatible Date: Tue, 16 Oct 2018 17:00:22 -0700 Message-Id: <20181017000027.23696-8-slongerbeam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181017000027.23696-1-slongerbeam@gmail.com> References: <20181017000027.23696-1-slongerbeam@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Steve Longerbeam Reviewed-by: Philipp Zabel --- 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 d5b0f8a66750..7e648fc9626a 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: