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 85F91C433F5 for ; Sat, 5 Feb 2022 03:43:10 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZlUXEumN4iwB2b3mXWk7qM4/4OXa1aaC9NynHD4wQCE=; b=X9W/wPVGnj/+Km Qc5jO6X/XP7dpnHuFz6MWhf4Ym0KiCR4XvVlhrHkwC6YWR9y1QZEZfjlSg0YTTG+t/O5YdmEYIGf/ HZpTVfeL0Vpq0OZHBeXw6dFGStX7NdjmazO80wxh/CVRHmsGLnilslOc7fn1zIB+ypAa+g7N4fra/ UQpkWkqWZ9QXD+1dCWOEokKYGtbF1I7p6c7ZbpY1XWmTcFbJIO5cDWEUmbyflZvz4AmVO3NpEX6lk Whuhdc5YxRaMx2jEfc3EzSaSVypoCOk0Vli2KGz2Pdz/DVbZxTxLZGVHxbzmazQlhp1y0vYhzBPoE IyaLL5Z71HAjlOEiMsTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nGBxN-0062a7-PT; Sat, 05 Feb 2022 03:41:49 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nGBxK-0062Yg-6H for linux-arm-kernel@lists.infradead.org; Sat, 05 Feb 2022 03:41:47 +0000 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A4A95472; Sat, 5 Feb 2022 04:41:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1644032504; bh=ls9fvq3A45YbaeIEXzVRsHp5ZlyRc/CArttx7bQLOss=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=L+lFttUc02i2HKa3dFdW89YX7EmP/kFCvHo+PIK5VgUMXnVX3UQdqi028ufX0x1px A35ALAd3kaby7JGqecwkaBZPizqn29JcTZgPbea+M3tKk0KAPLfUPJ1eOxjOJTlxcE HE4vS9iQeCyMTU8E1Ns8uzjPjd9BRDiB2a18/R1k= Date: Sat, 5 Feb 2022 05:41:20 +0200 From: Laurent Pinchart To: Alexander Stein Cc: Steve Longerbeam , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Rui Miguel Silva , Dorota Czaplejewicz , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/8] media: imx: Forward type of hardware implementation Message-ID: References: <20220204121514.2762676-1-alexander.stein@ew.tq-group.com> <20220204121514.2762676-3-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220204121514.2762676-3-alexander.stein@ew.tq-group.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220204_194146_409487_72C479EC X-CRM114-Status: GOOD ( 20.40 ) 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="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Alexander and Dorota, Thank you for the patch. On Fri, Feb 04, 2022 at 01:15:08PM +0100, Alexander Stein wrote: > From: Dorota Czaplejewicz > > Pass down the hardware type so imx_media_mbus_fmt_to_pix_fmt can do > the actual switch. > > Signed-off-by: Dorota Czaplejewicz > Signed-off-by: Alexander Stein Turning the bool into an enum as mentioned in the review of 1/8, Reviewed-by: Laurent Pinchart > --- > Changes in comparison to original commit from Dorota: > * is_imx56 is used instead of enum > > drivers/staging/media/imx/imx-media-capture.c | 15 +++++++++------ > drivers/staging/media/imx/imx-media-utils.c | 3 ++- > drivers/staging/media/imx/imx-media.h | 3 ++- > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c > index b61bf9f8ddf8..8aad6d6d350e 100644 > --- a/drivers/staging/media/imx/imx-media-capture.c > +++ b/drivers/staging/media/imx/imx-media-capture.c > @@ -139,7 +139,8 @@ static int capture_g_fmt_vid_cap(struct file *file, void *fh, > } > > static const struct imx_media_pixfmt * > -__capture_try_fmt(struct v4l2_pix_format *pixfmt, struct v4l2_rect *compose) > +__capture_try_fmt(struct v4l2_pix_format *pixfmt, struct v4l2_rect *compose, > + bool is_imx56) > { > struct v4l2_mbus_framefmt fmt_src; > const struct imx_media_pixfmt *cc; > @@ -171,7 +172,7 @@ __capture_try_fmt(struct v4l2_pix_format *pixfmt, struct v4l2_rect *compose) > } > > v4l2_fill_mbus_format(&fmt_src, pixfmt, 0); > - imx_media_mbus_fmt_to_pix_fmt(pixfmt, &fmt_src, cc); > + imx_media_mbus_fmt_to_pix_fmt(pixfmt, &fmt_src, cc, is_imx56); > > if (compose) { > compose->width = fmt_src.width; > @@ -184,7 +185,9 @@ __capture_try_fmt(struct v4l2_pix_format *pixfmt, struct v4l2_rect *compose) > static int capture_try_fmt_vid_cap(struct file *file, void *fh, > struct v4l2_format *f) > { > - __capture_try_fmt(&f->fmt.pix, NULL); > + struct capture_priv *priv = video_drvdata(file); > + > + __capture_try_fmt(&f->fmt.pix, NULL, priv->is_imx56); > return 0; > } > > @@ -199,7 +202,7 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, > return -EBUSY; > } > > - cc = __capture_try_fmt(&f->fmt.pix, &priv->vdev.compose); > + cc = __capture_try_fmt(&f->fmt.pix, &priv->vdev.compose, priv->is_imx56); > > priv->vdev.cc = cc; > priv->vdev.fmt = f->fmt.pix; > @@ -418,7 +421,7 @@ __capture_legacy_try_fmt(struct capture_priv *priv, > } > } > > - imx_media_mbus_fmt_to_pix_fmt(pixfmt, &fmt_src->format, cc); > + imx_media_mbus_fmt_to_pix_fmt(pixfmt, &fmt_src->format, cc, priv->is_imx56); > > return cc; > } > @@ -889,7 +892,7 @@ static int capture_init_format(struct capture_priv *priv) > fmt_src.format.height = IMX_MEDIA_DEF_PIX_HEIGHT; > } > > - imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt, &fmt_src.format, NULL); > + imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt, &fmt_src.format, NULL, priv->is_imx56); > vdev->compose.width = fmt_src.format.width; > vdev->compose.height = fmt_src.format.height; > > diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c > index 94bc866ca28c..0daa6aad45f4 100644 > --- a/drivers/staging/media/imx/imx-media-utils.c > +++ b/drivers/staging/media/imx/imx-media-utils.c > @@ -518,7 +518,8 @@ EXPORT_SYMBOL_GPL(imx_media_try_colorimetry); > > int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, > const struct v4l2_mbus_framefmt *mbus, > - const struct imx_media_pixfmt *cc) > + const struct imx_media_pixfmt *cc, > + bool is_imx56) > { > u32 width; > u32 stride; > diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h > index 73e8e6e0d8e8..2be1bc97955c 100644 > --- a/drivers/staging/media/imx/imx-media.h > +++ b/drivers/staging/media/imx/imx-media.h > @@ -198,7 +198,8 @@ void imx_media_try_colorimetry(struct v4l2_mbus_framefmt *tryfmt, > bool ic_route); > int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, > const struct v4l2_mbus_framefmt *mbus, > - const struct imx_media_pixfmt *cc); > + const struct imx_media_pixfmt *cc, > + bool is_imx56); > void imx_media_grp_id_to_sd_name(char *sd_name, int sz, > u32 grp_id, int ipu_id); > struct v4l2_subdev * -- Regards, Laurent Pinchart _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel