From patchwork Tue Apr 18 12:20:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13215584 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50B7FC6FD18 for ; Tue, 18 Apr 2023 12:22:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SP+dVQee4YYRHrX/M79JegWYc9D4nSknyquKrKVXMHY=; b=D1bIISFbZQ9RFV pwL4Ag523bfreWkoQFwUSisM4aQB1rfb7BwPxHvZ7umT7eHUc7xcM5azRrl+mCeK9nYSqEIrtnVyz JVS33HJxMJJHoDsdbYOTWT03pG9veQJ6zGPXJ2NMd3Whytzg/1G7wem0Jo9hW8jNijJm+qkzmKuoM eLKoszIOTcW5cCI83G9GHgS1YphJuqFQyM/aq4kIiWkzXK2YIOam3eS9Pl7S6iA2wpwkdAYsduiuy DlktCfcw9ymnWxu6JqG0YSJBOFi/3MxQM4253LUv73mntlFLfWlCy1Y8xmNaqWysVm4GgR0HPXfAJ MehoavxzlolOcPSA5KsQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pokKN-0025kq-0q; Tue, 18 Apr 2023 12:20:55 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pokKF-0025ez-3A for linux-arm-kernel@lists.infradead.org; Tue, 18 Apr 2023 12:20:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1681820448; x=1713356448; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x9t0YKFE5YdhFDRYs98DQ6cjcsr0r7KP+UROeDikahg=; b=UHAGSNdez/ku9o7dUPDFnnxmpgwwOB+Y62Dl+3ZwBvk7hooQhuIWVrJA g1+HkkPHE86x/EgOyTf3/Wrg5F7D54q4eP7wKYCrF5EY82RENBFO4RSSD V3/30ki9OEVhSRZLE/BNA9PRsRBJNtaFNLZCyugQSA179icmYG+KjQKfE z62XL9Qxe36YfS3LYzAkcrD968J+jjGNtnK1qPjCZ3gLb/tO3/7w114eI /nwjX6QPmpCTjp2ORvDqYphYHWC91SiE57aStbm8GIg7jiQJipVTY3R1t TfllMyWrwscHY3VXos1gKLvwIOL7YBNbaWB4bzsKK9J3z3kpH5R/FUROC w==; X-IronPort-AV: E=Sophos;i="5.99,207,1677538800"; d="scan'208";a="30398475" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 18 Apr 2023 14:20:45 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Tue, 18 Apr 2023 14:20:45 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Tue, 18 Apr 2023 14:20:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1681820445; x=1713356445; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x9t0YKFE5YdhFDRYs98DQ6cjcsr0r7KP+UROeDikahg=; b=jDNHH+pOmfjwQPfBiIT9K97+VCjBVtokt18T1neMICFa6uLGsgaFKM4a /c6DXC5/GVkHsB8V3s43SruiC94WmyQd0dEK+4lPot/YzAOX+T4hLri0C S60faKegr8eHOKX592FUceBCkv82rPGt5KGfEVlGLeezJW68t+0oHVVD/ p+NrrmE2fG2peUu/sbxJrrArg/BmO2dz2p966IgJW5hv6O796VJikeEaV dbE20UAL8EcRPE6TtwEp+/BVfbo5v4H3bWnfN4ajRt7Z6qw6JslFr86rm 6Ii/wLgrJ+pTst9vacMxJDkevRlmmKlv8x+7bgsTdnp4ZHgs/+ndwCAa4 w==; X-IronPort-AV: E=Sophos;i="5.99,207,1677538800"; d="scan'208";a="30398473" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 18 Apr 2023 14:20:45 +0200 Received: from steina-w.tq-net.de (unknown [10.123.53.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 59540280073; Tue, 18 Apr 2023 14:20:44 +0200 (CEST) From: Alexander Stein To: Rui Miguel Silva , Laurent Pinchart , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Alexander Stein , Pengutronix Kernel Team , NXP Linux Team , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/4] media: imx: imx7-media-csi: Remove interlave fields Date: Tue, 18 Apr 2023 14:20:39 +0200 Message-Id: <20230418122041.1318862-3-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418122041.1318862-1-alexander.stein@ew.tq-group.com> References: <20230418122041.1318862-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230418_052048_338121_B16DD5A3 X-CRM114-Status: GOOD ( 12.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Interlaced mode is currently not supported, so disable fields in try_fmt. Signed-off-by: Alexander Stein Reviewed-by: Laurent Pinchart --- Changes in v3: * Remove left-over interlace mode check drivers/media/platform/nxp/imx7-media-csi.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index b149374b07ee1..1315f5743b76f 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1162,20 +1162,6 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, cc = imx7_csi_find_pixel_format(pixfmt->pixelformat); } - /* Allow IDMAC interweave but enforce field order from source. */ - if (V4L2_FIELD_IS_INTERLACED(pixfmt->field)) { - switch (pixfmt->field) { - case V4L2_FIELD_SEQ_TB: - pixfmt->field = V4L2_FIELD_INTERLACED_TB; - break; - case V4L2_FIELD_SEQ_BT: - pixfmt->field = V4L2_FIELD_INTERLACED_BT; - break; - default: - break; - } - } - /* * Round up width for minimum burst size. * @@ -1187,6 +1173,7 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, pixfmt->bytesperline = pixfmt->width * cc->bpp / 8; pixfmt->sizeimage = pixfmt->bytesperline * pixfmt->height; + pixfmt->field = V4L2_FIELD_NONE; return cc; }