From patchwork Tue Apr 18 07:14:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13215110 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4E93C77B75 for ; Tue, 18 Apr 2023 07:14:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231248AbjDRHOy (ORCPT ); Tue, 18 Apr 2023 03:14:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231223AbjDRHOw (ORCPT ); Tue, 18 Apr 2023 03:14:52 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6477F1BFD for ; Tue, 18 Apr 2023 00:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1681802091; x=1713338091; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1LBMrWhnNp6GUM6Z+YxFtJgIM77IK2VB5D8IaBgDDtc=; b=DKNvuHs3yUNBVgXNKfqPmDbHNYL3ooUAFW5tefgDSd0kXD/cpDeOO12Z I5BddM+fDHA7618AWqax567eX65fcrcGhqYQnVIUB8i8rDuXJvdZntWkr lHmGbRFX8FvJiscW7G3Y7KW21jByuLtrOtBfucDbtgzpE4yd7I6xEaeL2 tlOHjw3LuP1xQZmRm0AdCZri3cWN2ONNat9mWWeoDmhj6WGXVsU/eYX94 eURjnfP/1AmGd89xmb0r9JsRqWJimFMaglBMMNM/1felKfa+1CMKBPE44 Bkxh87thVVytZ+XuJhjrNPbpQcNLvpsAo+V/nO9ltn8/0e85O9Xij+wN4 Q==; X-IronPort-AV: E=Sophos;i="5.99,206,1677538800"; d="scan'208";a="30385553" 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 09:14:46 +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 09:14:47 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Tue, 18 Apr 2023 09:14:47 +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=1681802086; x=1713338086; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1LBMrWhnNp6GUM6Z+YxFtJgIM77IK2VB5D8IaBgDDtc=; b=di5EfUCIWmp3wqPRtOdf0ivso9vRA3948K+suBhs+ZgcH2JCTRTx+fEe IdXjtERUMxOdeP/MYgJ3aANIUcSmemXKgKqGXjeTkwlIksc4td3nzNwCb ETbzA0l7mSkkKnel91hckEZhSMSVX0Nd0meODDd9QPbdb3cKEnOQH53vE tmoWdTmAW19OF5/JRjivLt1KIyATa5YFeaGrj4hi7wN8k7zo8B/KwXr/R b71y5SIZ/baOgLQ4nYDTsiqttB8IknckHHEVWW51IMy6eCQ9xxmBCa9uU /JVP+5e0hCqBR3Z48EtTKIatmi/IPXD/QvhxcwZf9Y3Vk7h4Kx93be4zo Q==; X-IronPort-AV: E=Sophos;i="5.99,206,1677538800"; d="scan'208";a="30385551" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 18 Apr 2023 09:14:46 +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 98C66280072; Tue, 18 Apr 2023 09:14:46 +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 v2 1/3] media: imx: imx7-media-csi: Get rid of superfluous call to imx7_csi_mbus_fmt_to_pix_fmt Date: Tue, 18 Apr 2023 09:14:37 +0200 Message-Id: <20230418071439.197735-2-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418071439.197735-1-alexander.stein@ew.tq-group.com> References: <20230418071439.197735-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org There is no need to convert input pixformat to mbus_framefmt and back again. Instead apply pixformat width contrains directly. Signed-off-by: Alexander Stein --- drivers/media/platform/nxp/imx7-media-csi.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index b701e823436a8..bd649fd9166fd 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1145,8 +1145,8 @@ static const struct imx7_csi_pixfmt * __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, struct v4l2_rect *compose) { - struct v4l2_mbus_framefmt fmt_src; const struct imx7_csi_pixfmt *cc; + u32 stride; /* * Find the pixel format, default to the first supported format if not @@ -1172,12 +1172,16 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, } } - v4l2_fill_mbus_format(&fmt_src, pixfmt, 0); - imx7_csi_mbus_fmt_to_pix_fmt(pixfmt, &fmt_src, cc); + v4l_bound_align_image(&pixfmt->width, 1, 0xffff, 8, + &pixfmt->height, 1, 0xffff, 1, 0); + + stride = round_up((pixfmt->width * cc->bpp) / 8, 8); + pixfmt->bytesperline = stride; + pixfmt->sizeimage = stride * pixfmt->height; if (compose) { - compose->width = fmt_src.width; - compose->height = fmt_src.height; + compose->width = pixfmt->width; + compose->height = pixfmt->height; } return cc; From patchwork Tue Apr 18 07:14:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13215111 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACD37C77B76 for ; Tue, 18 Apr 2023 07:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231263AbjDRHO4 (ORCPT ); Tue, 18 Apr 2023 03:14:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231159AbjDRHOy (ORCPT ); Tue, 18 Apr 2023 03:14:54 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7ED826AC for ; Tue, 18 Apr 2023 00:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1681802092; x=1713338092; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2EYb/WP0dlj6VHt6K2PVtPnez7y5ZDVOsDqBPCYyofs=; b=YLdzbB1+Mo8mz0C+FQBnHRDk9pC47nAOTIOa9vb5rqsGbt1FTE7cu/Pz Tr6JifGamO7vPSeIdPA5jayo0ZHEKrfdCwnyrmqJoaZ+wik6vSRjcfzPk WZO83CznwLZ12T8h1sCLShtYVwK4VaFZ9rnyeQMUYNDYZnQcBBeQaDdwK RzbfkgO189Z3iAMJf4XalvSaLdm27Z5xCEO/NY8a9ltpLtGlDjSD0xGC/ 5hl5o0j2Fl7rcQ/ekH/OomGLkzWq14b7Se4PLfX+oa6EVNNA7G6mabJ+V rSDTNMOElGXU3ABRFkbgLWga2sEnBpKkxdR5xBbpKN4Fwaz95o16+zyuU Q==; X-IronPort-AV: E=Sophos;i="5.99,206,1677538800"; d="scan'208";a="30385556" 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 09:14:47 +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 09:14:47 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Tue, 18 Apr 2023 09:14:47 +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=1681802087; x=1713338087; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2EYb/WP0dlj6VHt6K2PVtPnez7y5ZDVOsDqBPCYyofs=; b=bTA0rAlLgYMqtpqCACot7AYTUVAHnMw0sSFLlA0acHgrIPguaZV1TJeU tNVhdKUPDQsJyr4X9Yuc60l9DVluLmZFXNkhZE12aTZu2hy9s0E+T/3AW jMNqHkgfAJ2xC+jjyyuYGCQAU7Iw60d3JZX4OP+UGz3FdBtcIzOZD9rcc jQ6W34tjSe2nO4QA7iCXVo7rRBccbNWes1hd0uoJ0uABvEFfU3EAB+P9o g/5sBUGyb1iKTREcTWwyjTzMMkfJfx/bSYfPz565tu0vKqZhC+YfpNb5V SuK9pPjaz2/aDgBakaup2ltFO4po97MyMIn6rx+5+xe99wyk/Op2Mi2Aq A==; X-IronPort-AV: E=Sophos;i="5.99,206,1677538800"; d="scan'208";a="30385555" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 18 Apr 2023 09:14:47 +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 C809E280073; Tue, 18 Apr 2023 09:14:46 +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 v2 2/3] media: imx: imx7-media-csi: Remove interlave fields Date: Tue, 18 Apr 2023 09:14:38 +0200 Message-Id: <20230418071439.197735-3-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418071439.197735-1-alexander.stein@ew.tq-group.com> References: <20230418071439.197735-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Interlaced mode is currently not supported, so disable fields in try_fmt. Signed-off-by: Alexander Stein --- drivers/media/platform/nxp/imx7-media-csi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index bd649fd9166fd..1508f6ba20e91 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1178,6 +1178,7 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, stride = round_up((pixfmt->width * cc->bpp) / 8, 8); pixfmt->bytesperline = stride; pixfmt->sizeimage = stride * pixfmt->height; + pixfmt->field = V4L2_FIELD_NONE; if (compose) { compose->width = pixfmt->width; From patchwork Tue Apr 18 07:14: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: 13215112 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4453C77B71 for ; Tue, 18 Apr 2023 07:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbjDRHO6 (ORCPT ); Tue, 18 Apr 2023 03:14:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231249AbjDRHOy (ORCPT ); Tue, 18 Apr 2023 03:14:54 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 075C7273C for ; Tue, 18 Apr 2023 00:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1681802093; x=1713338093; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=edaL6dP8udaoBENjAOXy9u4eKuGvdt1NYMIa3nDzb9Q=; b=p2FK9wFpG8SKNbgvp8SN4VZZii0haBfP+9g6Ahlg5JA4emgDzzCsNnuS E4Bfy/r9/RO0BXIGtw3WdkDwYh5qEhiglKwu93s8L81mrf4+CE2UXu5IP NaJR/W8auwvh9ULqs4zMx0vB18k/fE8It6hZprAu8VtdX7Kmn5FGQusCE 1n3QFc9YzUU9AJEc9sDWNqDDoeC3kqLKikBWbCQ/n+QCVkS1yRjkrR1yg v6xB8zYYYVWdkAwYPdCZtkLVmNQH/IG+F810OGr5i3aTVjuczQszQXrWs zWqKKdTzZVYIsBLlj+bScz1FyufhvgEfNArK2YucDzPdSwDoRR1fzljqg w==; X-IronPort-AV: E=Sophos;i="5.99,206,1677538800"; d="scan'208";a="30385558" 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 09:14:47 +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 09:14:47 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Tue, 18 Apr 2023 09:14:47 +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=1681802087; x=1713338087; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=edaL6dP8udaoBENjAOXy9u4eKuGvdt1NYMIa3nDzb9Q=; b=l6XcpwZaYyDwzkEE71WvcRI6G29deS/DKUHq/w9v/4PLC8FwLMaNpj6y ya3d22G7+Vz+hygEA0jnztKByExWgLjkT1lL+6KwEkIF0iQPsWCGQ2gFA /ZW8ZpJTZkc0guHvVOXU8ggY1TsJDFicHvvXdwEVm/AztIyBK+03Fdujt ubJ2Kgq9oHXHuTNVGAjn+GXKQXQXaI35yED9Y8TUI4dOwUgUlujNt4ep3 6KVT1Zj9361oL1otLRUUwxH3bpbWe0Bn+MAIpKgIfsLBbWsc9QtQoS7SK veylED7rPUFR4kfJKs2uIcVHUdkEiSjf+k6Qi1X0xSgqxwL7zk9MwOvXv Q==; X-IronPort-AV: E=Sophos;i="5.99,206,1677538800"; d="scan'208";a="30385557" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 18 Apr 2023 09:14:47 +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 3AA40280074; Tue, 18 Apr 2023 09:14:47 +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 v2 3/3] media: imx: imx7-media-csi: Lift width constraints for 8bpp formats Date: Tue, 18 Apr 2023 09:14:39 +0200 Message-Id: <20230418071439.197735-4-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418071439.197735-1-alexander.stein@ew.tq-group.com> References: <20230418071439.197735-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org For 8-bit formats the image_width just needs to be a multiple of 4 pixels. Signed-off-by: Alexander Stein --- drivers/media/platform/nxp/imx7-media-csi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index 1508f6ba20e91..5240670476b2b 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1147,6 +1147,7 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, { const struct imx7_csi_pixfmt *cc; u32 stride; + u32 walign; /* * Find the pixel format, default to the first supported format if not @@ -1172,7 +1173,13 @@ __imx7_csi_video_try_fmt(struct v4l2_pix_format *pixfmt, } } - v4l_bound_align_image(&pixfmt->width, 1, 0xffff, 8, + /* Refer to CSI_IMAG_PARA.IMAGE_WIDTH description */ + if (cc->bpp == 8) + walign = 8; + else + walign = 4; + + v4l_bound_align_image(&pixfmt->width, 1, 0xffff, walign, &pixfmt->height, 1, 0xffff, 1, 0); stride = round_up((pixfmt->width * cc->bpp) / 8, 8);