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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25C61C43219 for ; Tue, 30 Apr 2019 22:00:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9B8C2087B for ; Tue, 30 Apr 2019 22:00:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QtjNoi4k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727130AbfD3WA3 (ORCPT ); Tue, 30 Apr 2019 18:00:29 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40118 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726048AbfD3WA3 (ORCPT ); Tue, 30 Apr 2019 18:00:29 -0400 Received: by mail-wr1-f68.google.com with SMTP id h4so22725843wre.7; Tue, 30 Apr 2019 15:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=E9gRorpjrqrm2u1kzV3mXvUyhxsmfw6B4Rz1MCua/tM=; b=QtjNoi4ktunAqcqybNWp72UBUX+DTzsAMsppkVa5XNugtZxp7wEGbD6hnyE4/E6yO9 4lFeTqBsoqlzGUvhnMnUW05Bt9Ry+P6/ELdPY9MNGYaH2vtP4Ng5F5cdhzPfJSZS3Z7r cmybtCMqc6lcaULctz3nJSoY265xQmLKOa026gSYqH6Fbk7A3WQuzvxViIJULGiesNj2 E2VheNmzo/SzH8Xt2vuaz7i44UuJ4PFm8ZSSRl41i7TcbwXDE7XpgmTSiHQbdwer7l2F 2z9/f7uZXhoLKEkPEpJiWmea8qd9IkerNaBcfrGYXy0JXNz7amDt9TTImRwcGGr5APZg T8Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=E9gRorpjrqrm2u1kzV3mXvUyhxsmfw6B4Rz1MCua/tM=; b=nriHerCTWrjh2gJMuae7G6BS/GMdrFwdQO49n/8SJYd9OYUSpE9y0oeLCIjCe8Ve5u uXXHmjg5lJJPb4ksEE3FRp3GuEY6ahX+tmSGlDsShYtjNG5eamFrmdwqTyBZm+G1vVuQ /cHzceOzzRuZ8NZ7ixoAaQFWtgPU2iqTl4xgWLJ3zQKCEX92m5Bul5PSEcU3G5Y3QpdT kux7wGpPQcKB2He43mMaZDJtykbTxbVcBnEohIR84TRU0jWm6Ht/+AJssZw+3vlr2j4k YvgrRDK7aRze4fRzhQ/WbGtLBUTLPnhzKIlVfy/RQd5EtqO1KQpb9ooA8+i/7M0x3LTE zLWA== X-Gm-Message-State: APjAAAVo3u6BEdkuZSTntNwbyYHmMIWzm3rTCf9AQ2YSAoLsBIQeY0T5 ltKAI4+tlz1l9nuMESMPtE5bCqOeZ255jA== X-Google-Smtp-Source: APXvYqznGlr+EUodSbRSk9TFX16aHKvK+NqVmZTaIqQTKLCE8s+G1biaXgxrMRJmBEU3UvZpZvHyow== X-Received: by 2002:a5d:674f:: with SMTP id l15mr22229834wrw.41.1556661625898; Tue, 30 Apr 2019 15:00:25 -0700 (PDT) Received: from arch-late (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id j131sm6612673wmb.9.2019.04.30.15.00.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 30 Apr 2019 15:00:25 -0700 (PDT) References: <20190428190916.26567-1-slongerbeam@gmail.com> <20190428190916.26567-5-slongerbeam@gmail.com> User-agent: mu4e 1.2.0; emacs 27.0.50 From: Rui Miguel Silva To: driverdev-devel@linuxdriverproject.org Cc: linux-media@vger.kernel.org, "open list\:STAGING SUBSYSTEM" , Pengutronix Kernel Team , Greg Kroah-Hartman , Sascha Hauer , open list , NXP Linux Team , Philipp Zabel , Steve Longerbeam , Mauro Carvalho Chehab , Shawn Guo , "moderated list\:ARM\/FREESCALE IMX \/ MXC ARM ARCHITECTURE" Subject: Re: [PATCH v2 4/8] Revert "media: imx: Set capture compose rectangle in capture_device_set_format" In-reply-to: <20190428190916.26567-5-slongerbeam@gmail.com> Date: Tue, 30 Apr 2019 23:00:23 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Steve, On Sun 28 Apr 2019 at 20:09, Steve Longerbeam wrote: > Rvert this commit, as imx_media_capture_device_set_format() will be > removed. > > This reverts commit 5964cbd8692252615370b77eb96764dd70c2f837. > > Signed-off-by: Steve Longerbeam > --- > drivers/staging/media/imx/imx-ic-prpencvf.c | 5 ++-- > drivers/staging/media/imx/imx-media-capture.c | 24 +++++++++---------- > drivers/staging/media/imx/imx-media-csi.c | 5 ++-- > drivers/staging/media/imx/imx-media-utils.c | 20 ++++------------ > drivers/staging/media/imx/imx-media.h | 6 ++--- > 5 files changed, 23 insertions(+), 37 deletions(-) > > diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c > index 8242d88dfb82..afaa3a8b15e9 100644 > --- a/drivers/staging/media/imx/imx-ic-prpencvf.c > +++ b/drivers/staging/media/imx/imx-ic-prpencvf.c > @@ -910,7 +910,6 @@ static int prp_set_fmt(struct v4l2_subdev *sd, > const struct imx_media_pixfmt *cc; > struct v4l2_pix_format vdev_fmt; > struct v4l2_mbus_framefmt *fmt; > - struct v4l2_rect vdev_compose; > int ret = 0; > > if (sdformat->pad >= PRPENCVF_NUM_PADS) > @@ -952,11 +951,11 @@ static int prp_set_fmt(struct v4l2_subdev *sd, > priv->cc[sdformat->pad] = cc; > > /* propagate output pad format to capture device */ > - imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, &vdev_compose, > + imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, > &priv->format_mbus[PRPENCVF_SRC_PAD], > priv->cc[PRPENCVF_SRC_PAD]); > mutex_unlock(&priv->lock); > - imx_media_capture_device_set_format(vdev, &vdev_fmt, &vdev_compose); > + imx_media_capture_device_set_format(vdev, &vdev_fmt); > > return 0; > out: > diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c > index 335084a6b0cd..555f6204660b 100644 > --- a/drivers/staging/media/imx/imx-media-capture.c > +++ b/drivers/staging/media/imx/imx-media-capture.c > @@ -205,8 +205,7 @@ static int capture_g_fmt_vid_cap(struct file *file, void *fh, > > static int __capture_try_fmt_vid_cap(struct capture_priv *priv, > struct v4l2_subdev_format *fmt_src, > - struct v4l2_format *f, > - struct v4l2_rect *compose) > + struct v4l2_format *f) > { > const struct imx_media_pixfmt *cc, *cc_src; > > @@ -246,8 +245,7 @@ static int __capture_try_fmt_vid_cap(struct capture_priv *priv, > } > } > > - imx_media_mbus_fmt_to_pix_fmt(&f->fmt.pix, compose, > - &fmt_src->format, cc); > + imx_media_mbus_fmt_to_pix_fmt(&f->fmt.pix, &fmt_src->format, cc); > > return 0; > } > @@ -265,7 +263,7 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh, > if (ret) > return ret; > > - return __capture_try_fmt_vid_cap(priv, &fmt_src, f, NULL); > + return __capture_try_fmt_vid_cap(priv, &fmt_src, f); > } > > static int capture_s_fmt_vid_cap(struct file *file, void *fh, > @@ -273,7 +271,6 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, > { > struct capture_priv *priv = video_drvdata(file); > struct v4l2_subdev_format fmt_src; > - struct v4l2_rect compose; > int ret; > > if (vb2_is_busy(&priv->q)) { > @@ -287,14 +284,17 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh, > if (ret) > return ret; > > - ret = __capture_try_fmt_vid_cap(priv, &fmt_src, f, &compose); > + ret = __capture_try_fmt_vid_cap(priv, &fmt_src, f); > if (ret) > return ret; > > priv->vdev.fmt.fmt.pix = f->fmt.pix; > priv->vdev.cc = imx_media_find_format(f->fmt.pix.pixelformat, > CS_SEL_ANY, true); > - priv->vdev.compose = compose; > + priv->vdev.compose.left = 0; > + priv->vdev.compose.top = 0; > + priv->vdev.compose.width = fmt_src.format.width; > + priv->vdev.compose.height = fmt_src.format.height; > > return 0; > } > @@ -655,8 +655,7 @@ static struct video_device capture_videodev = { > }; > > void imx_media_capture_device_set_format(struct imx_media_video_dev *vdev, > - const struct v4l2_pix_format *pix, > - const struct v4l2_rect *compose) > + struct v4l2_pix_format *pix) > { > struct capture_priv *priv = to_capture_priv(vdev); > > @@ -664,7 +663,6 @@ void imx_media_capture_device_set_format(struct imx_media_video_dev *vdev, > priv->vdev.fmt.fmt.pix = *pix; > priv->vdev.cc = imx_media_find_format(pix->pixelformat, CS_SEL_ANY, > true); > - priv->vdev.compose = *compose; > mutex_unlock(&priv->mutex); > } > EXPORT_SYMBOL_GPL(imx_media_capture_device_set_format); > @@ -770,8 +768,10 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) > } > > vdev->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; > - imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, &vdev->compose, > + imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix, > &fmt_src.format, NULL); > + vdev->compose.width = fmt_src.format.width; > + vdev->compose.height = fmt_src.format.height; > vdev->cc = imx_media_find_format(vdev->fmt.fmt.pix.pixelformat, > CS_SEL_ANY, false); > > diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c > index c70fa6b509ae..09b89a72eaa2 100644 > --- a/drivers/staging/media/imx/imx-media-csi.c > +++ b/drivers/staging/media/imx/imx-media-csi.c > @@ -1512,7 +1512,6 @@ static int csi_set_fmt(struct v4l2_subdev *sd, > struct v4l2_pix_format vdev_fmt; > struct v4l2_mbus_framefmt *fmt; > struct v4l2_rect *crop, *compose; > - struct v4l2_rect vdev_compose; > int ret; > > if (sdformat->pad >= CSI_NUM_PADS) > @@ -1568,11 +1567,11 @@ static int csi_set_fmt(struct v4l2_subdev *sd, > priv->cc[sdformat->pad] = cc; > > /* propagate IDMAC output pad format to capture device */ > - imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, &vdev_compose, > + imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, > &priv->format_mbus[CSI_SRC_PAD_IDMAC], > priv->cc[CSI_SRC_PAD_IDMAC]); > mutex_unlock(&priv->lock); > - imx_media_capture_device_set_format(vdev, &vdev_fmt, &vdev_compose); > + imx_media_capture_device_set_format(vdev, &vdev_fmt); > > return 0; > out: > diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c > index 8a6e57652402..a80ef0b087ad 100644 > --- a/drivers/staging/media/imx/imx-media-utils.c > +++ b/drivers/staging/media/imx/imx-media-utils.c > @@ -577,8 +577,7 @@ void imx_media_fill_default_mbus_fields(struct v4l2_mbus_framefmt *tryfmt, > EXPORT_SYMBOL_GPL(imx_media_fill_default_mbus_fields); > > int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, > - struct v4l2_rect *compose, > - const struct v4l2_mbus_framefmt *mbus, > + struct v4l2_mbus_framefmt *mbus, > const struct imx_media_pixfmt *cc) > { > u32 width; > @@ -625,17 +624,6 @@ int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, > pix->sizeimage = cc->planar ? ((stride * pix->height * cc->bpp) >> 3) : > stride * pix->height; > > - /* > - * set capture compose rectangle, which is fixed to the > - * source subdevice mbus format. > - */ > - if (compose) { > - compose->left = 0; > - compose->top = 0; > - compose->width = mbus->width; > - compose->height = mbus->height; > - } > - > return 0; > } > EXPORT_SYMBOL_GPL(imx_media_mbus_fmt_to_pix_fmt); > @@ -647,11 +635,13 @@ int imx_media_mbus_fmt_to_ipu_image(struct ipu_image *image, > > memset(image, 0, sizeof(*image)); > > - ret = imx_media_mbus_fmt_to_pix_fmt(&image->pix, &image->rect, > - mbus, NULL); > + ret = imx_media_mbus_fmt_to_pix_fmt(&image->pix, mbus, NULL); > if (ret) > return ret; > > + image->rect.width = mbus->width; > + image->rect.height = mbus->height; > + > return 0; > } > EXPORT_SYMBOL_GPL(imx_media_mbus_fmt_to_ipu_image); > diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h > index 71e20f53ed7b..ddea972b7bc4 100644 > --- a/drivers/staging/media/imx/imx-media.h > +++ b/drivers/staging/media/imx/imx-media.h > @@ -174,8 +174,7 @@ void imx_media_fill_default_mbus_fields(struct v4l2_mbus_framefmt *tryfmt, > struct v4l2_mbus_framefmt *fmt, > bool ic_route); > int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, > - struct v4l2_rect *compose, > - const struct v4l2_mbus_framefmt *mbus, > + struct v4l2_mbus_framefmt *mbus, > const struct imx_media_pixfmt *cc); Also here you change this function arguments and only remove it from imx7-media-csi.c in the next patch, triggering: vers/staging/media/imx/imx7-media-csi.c: In function 'imx7_csi_set_fmt': drivers/staging/media/imx/imx7-media-csi.c:1089:43: error: passing argument 2 of 'imx_media_mbus_fmt_to_pix_fmt' from incompatible pointer type [-Werror=incompatible-pointer-types] imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, &vdev_compose, ^~~~~~~~~~~~~ In file included from drivers/staging/media/imx/imx7-media-csi.c:30: drivers/staging/media/imx/imx-media.h:177:34: note: expected 'struct v4l2_mbus_framefmt *' but argument is of type 'struct v4l2_rect *' struct v4l2_mbus_framefmt *mbus, ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ drivers/staging/media/imx/imx7-media-csi.c:1090:11: error: passing argument 3 of 'imx_media_mbus_fmt_to_pix_fmt' from incompatible pointer type [-Werror=incompatible-pointer-types] &csi->format_mbus[IMX7_CSI_PAD_SRC], ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/staging/media/imx/imx7-media-csi.c:30: drivers/staging/media/imx/imx-media.h:178:38: note: expected 'const struct imx_media_pixfmt *' but argument is of type 'struct v4l2_mbus_framefmt *' const struct imx_media_pixfmt *cc); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~ drivers/staging/media/imx/imx7-media-csi.c:1089:2: error: too many arguments to function 'imx_media_mbus_fmt_to_pix_fmt' imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, &vdev_compose, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/staging/media/imx/imx7-media-csi.c:30: drivers/staging/media/imx/imx-media.h:176:5: note: declared here int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/staging/media/imx/imx7-media-csi.c:1093:2: error: too many arguments to function 'imx_media_capture_device_set_format' imx_media_capture_device_set_format(vdev, &vdev_fmt, &vdev_compose); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/staging/media/imx/imx7-media-csi.c:30: drivers/staging/media/imx/imx-media.h:281:6: note: declared here void imx_media_capture_device_set_format(struct imx_media_video_dev *vdev, --- Cheers, Rui