From mboxrd@z Thu Jan 1 00:00:00 1970 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 B7748C6FD18 for ; Tue, 18 Apr 2023 12:21:20 +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=nFVcYYY2RMZgYIDCfWvYvatN5psHuVg4lk6PtXLzHr8=; b=AKhltOXbbempgB 0iBDyMDLW01wboQMMXsFrBEll9aJl3TE2Pe1HDB9aA7/2hTKFIJ2gq9rDeyhC8KO+zS9pMzGL5eIw /H+WreexrSy/ZX5Cn87w+ECkXzxZmAKT4EdSylvK19mD0bGonnaFc0PcACRgCTpDD3NSERuLbwIrG Xh23/JcQX42xxiQpbJ1MMxHy1jZXVSnxJzim0/GDxSkJ/KCRHlxBLJP2fB52ssUtn812GQY5G7+vQ jIvg3WVLqbsJ9waRjlf2nWNpOjLAekWlQZy5qDK2V+xuxqK38XjW2SLkbh96XJNCT9AsyEfOkZFcZ p60Hn9EyjHpNLQx1/lpw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pokJu-0025dX-13; Tue, 18 Apr 2023 12:20:26 +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 1pokJq-0025bK-2s for linux-arm-kernel@lists.infradead.org; Tue, 18 Apr 2023 12:20:24 +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=1681820422; x=1713356422; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XIY9R3U0v54xAcDhl9OTq5nNyJ9/NWSYPz4k0wiW49E=; b=UjYqQGH51jVR3PfD3JNmQctxljP4hgYIFEEsqBY/Gv4LrDPzSWP7uR0M SFltBslYMzXqRIGifd8Ct4pNsXVj3PyEhz9gExLA5/pHGqgdecU9W07U0 Umvou+Ibj/R6aFyW4hJxALq7edpem824EWjdGNQBBbiAiQ2Fx9+o9aj5s EjHNUVblIjlJ/86F3neCoIUrSLIGqjyP4mVjKcdoa1QZMwvjdq4xZXUmV A2MKSWzVkJVq0M0Krd8za0m3HKhIk9bihqdFVU13CeDQTMF98SihbQQvx 2kzpIRaeZdS1PAGqK0pL5nKErsgk85obHcNz612fA4xrS1TUrh0VALfqP g==; X-IronPort-AV: E=Sophos;i="5.99,207,1677538800"; d="scan'208";a="30398463" 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:12 +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:12 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Tue, 18 Apr 2023 14:20:12 +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=1681820412; x=1713356412; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XIY9R3U0v54xAcDhl9OTq5nNyJ9/NWSYPz4k0wiW49E=; b=TE53WcDrySQ8UWDICrqtOBFYCwtET7vLQMOQHvxP2DC48Go3GmxiS9hl 8ASjGGMFceQhPpEAOrJPg9oQciNXbk2zXxPitSCqWopTrsjckjG2Ejgp0 Ld1QN7sV8ccVqwU9W4l5iFfJ35QIYyDQXSA8uvhuQO8+mkSd8PvG8XtCS Nk8ULSyouzpowQWb158SxLfav4l+1HHUi872Uk2kaPPAP4A8ETyxNAHbP YnGpppDyKu6lEjOEX0lRsYO7ypcrLQrTnvx6vMC4v7bKFizg9Auhr3gaA Ma93P3O50fTtrhPvXHstEB85fMGIuGweviQMruQK/Y4FLoojp0sIQBMTa Q==; X-IronPort-AV: E=Sophos;i="5.99,207,1677538800"; d="scan'208";a="30398462" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 18 Apr 2023 14:20:12 +0200 Received: from steina-w.localnet (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 07716280056; Tue, 18 Apr 2023 14:20:12 +0200 (CEST) From: Alexander Stein To: linux-media@vger.kernel.org, Laurent Pinchart Cc: Rui Miguel Silva , Mauro Carvalho Chehab , Shawn Guo , Sascha Hauer , Fabio Estevam , Pengutronix Kernel Team , NXP Linux Team , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] media: imx: imx7-media-csi: Init default format with __imx7_csi_video_try_fmt() Date: Tue, 18 Apr 2023 14:20:11 +0200 Message-ID: <2253651.irdbgypaU6@steina-w> Organization: TQ-Systems GmbH In-Reply-To: <20230418100417.20428-1-laurent.pinchart@ideasonboard.com> References: <20230418071439.197735-1-alexander.stein@ew.tq-group.com> <20230418100417.20428-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230418_052023_234688_5A290F35 X-CRM114-Status: GOOD ( 25.23 ) 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: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Laurent, thanks for the nice cleanup. Am Dienstag, 18. April 2023, 12:04:17 CEST schrieb Laurent Pinchart: > Use the __imx7_csi_video_try_fmt() helper function to initialize the > default format at probe time. This improves consistency by using the > same code path for both default initialization and validation at > runtime, and allows dropping the now unused imx7_csi_find_pixel_format() > function. > = > Signed-off-by: Laurent Pinchart > --- > Hi Alexander, > = > This is an additional cleanup that applies on top of "[PATCH v2 0/3] Fix > imx7-media-csi format settings". I've only compile-tested it as I'm > currently lacking access to test hardware. Would you be able to test the > patch ? If so, could you please include it in the v2 of your series ? I can't detect any difference in 'media-ctl -p' right after boot, so I assume the initialization is identical. LGTM, I'll include in v3 of my series. Thanks, Alexander > --- > drivers/media/platform/nxp/imx7-media-csi.c | 55 +++------------------ > 1 file changed, 6 insertions(+), 49 deletions(-) > = > diff --git a/drivers/media/platform/nxp/imx7-media-csi.c > b/drivers/media/platform/nxp/imx7-media-csi.c index > 5240670476b2..e52d617eea59 100644 > --- a/drivers/media/platform/nxp/imx7-media-csi.c > +++ b/drivers/media/platform/nxp/imx7-media-csi.c > @@ -1014,39 +1014,6 @@ static int imx7_csi_enum_mbus_formats(u32 *code, u= 32 > index) return -EINVAL; > } > = > -static int imx7_csi_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, > - const struct = v4l2_mbus_framefmt *mbus, > - const struct imx7_csi_pixfmt = *cc) > -{ > - u32 width; > - u32 stride; > - > - if (!cc) { > - cc =3D imx7_csi_find_mbus_format(mbus->code); > - if (!cc) > - return -EINVAL; > - } > - > - /* Round up width for minimum burst size */ > - width =3D round_up(mbus->width, 8); > - > - /* Round up stride for IDMAC line start address alignment */ > - stride =3D round_up((width * cc->bpp) >> 3, 8); > - > - pix->width =3D width; > - pix->height =3D mbus->height; > - pix->pixelformat =3D cc->fourcc; > - pix->colorspace =3D mbus->colorspace; > - pix->xfer_func =3D mbus->xfer_func; > - pix->ycbcr_enc =3D mbus->ycbcr_enc; > - pix->quantization =3D mbus->quantization; > - pix->field =3D mbus->field; > - pix->bytesperline =3D stride; > - pix->sizeimage =3D stride * pix->height; > - > - return 0; > -} > - > /* > -------------------------------------------------------------------------= -- > -- * Video Capture Device - IOCTLs > */ > @@ -1618,22 +1585,14 @@ static struct imx7_csi_vb2_buffer > *imx7_csi_video_next_buf(struct imx7_csi *csi) return buf; > } > = > -static int imx7_csi_video_init_format(struct imx7_csi *csi) > +static void imx7_csi_video_init_format(struct imx7_csi *csi) > { > - struct v4l2_mbus_framefmt format =3D { }; > + struct v4l2_pix_format *pixfmt =3D &csi->vdev_fmt; > = > - format.code =3D IMX7_CSI_DEF_MBUS_CODE; > - format.width =3D IMX7_CSI_DEF_PIX_WIDTH; > - format.height =3D IMX7_CSI_DEF_PIX_HEIGHT; > - format.field =3D V4L2_FIELD_NONE; > + pixfmt->width =3D IMX7_CSI_DEF_PIX_WIDTH; > + pixfmt->height =3D IMX7_CSI_DEF_PIX_HEIGHT; > = > - imx7_csi_mbus_fmt_to_pix_fmt(&csi->vdev_fmt, &format, NULL); > - csi->vdev_compose.width =3D format.width; > - csi->vdev_compose.height =3D format.height; > - > - csi->vdev_cc =3D imx7_csi_find_pixel_format(csi- >vdev_fmt.pixelformat); > - > - return 0; > + csi->vdev_cc =3D __imx7_csi_video_try_fmt(pixfmt, &csi->vdev_compose); > } > = > static int imx7_csi_video_register(struct imx7_csi *csi) > @@ -1646,9 +1605,7 @@ static int imx7_csi_video_register(struct imx7_csi > *csi) vdev->v4l2_dev =3D v4l2_dev; > = > /* Initialize the default format and compose rectangle. */ > - ret =3D imx7_csi_video_init_format(csi); > - if (ret < 0) > - return ret; > + imx7_csi_video_init_format(csi); > = > /* Register the video device. */ > ret =3D video_register_device(vdev, VFL_TYPE_VIDEO, -1); -- = TQ-Systems GmbH | M=FChlstra=DFe 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht M=FCnchen, HRB 105018 Gesch=E4ftsf=FChrer: Detlef Schneider, R=FCdiger Stahl, Stefan Schneider http://www.tq-group.com/ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel