[PATCH] imx7-media-csi.c: fix merge breakage

[PATCH] imx7-media-csi.c: fix merge breakage

[Hans Verkuil]

Commit 5964cbd86922 ("imx: Set capture compose rectangle in
capture_device_set_format") broke the compilation of commit
05f634040c0d ("staging/imx7: add imx7 CSI subdev driver").

These patches came in through different pull requests and
nobody noticed that the first changed functions that the
second relied upon.

Update imx7-media-csi.c accordingly.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index c1cf80bcad64..d775e259fece 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1036,6 +1036,7 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
 	const struct imx_media_pixfmt *outcc;
 	struct v4l2_mbus_framefmt *outfmt;
 	struct v4l2_pix_format vdev_fmt;
+	struct v4l2_rect vdev_compose;
 	const struct imx_media_pixfmt *cc;
 	struct v4l2_mbus_framefmt *fmt;
 	struct v4l2_subdev_format format;
@@ -1082,11 +1083,11 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
 	csi->cc[sdformat->pad] = cc;

 	/* propagate output pad format to capture device */
-	imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt,
+	imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, &vdev_compose,
 				      &csi->format_mbus[IMX7_CSI_PAD_SRC],
 				      csi->cc[IMX7_CSI_PAD_SRC]);
 	mutex_unlock(&csi->lock);
-	imx_media_capture_device_set_format(vdev, &vdev_fmt);
+	imx_media_capture_device_set_format(vdev, &vdev_fmt, &vdev_compose);

 	return 0;

Re: [PATCH] imx7-media-csi.c: fix merge breakage

[Rui Miguel Silva]

Hi Hans,
On Tue 19 Feb 2019 at 07:38, Hans Verkuil wrote:
> Commit 5964cbd86922 ("imx: Set capture compose rectangle in
> capture_device_set_format") broke the compilation of commit
> 05f634040c0d ("staging/imx7: add imx7 CSI subdev driver").
>
> These patches came in through different pull requests and
> nobody noticed that the first changed functions that the
> second relied upon.
>
> Update imx7-media-csi.c accordingly.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

I am travelling, with no possibility to test this, but LGTM.
Thanks for this.

Acked-by: Rui Miguel Silva <rui.silva@linaro.org>

---
Cheers,
	Rui


> ---
> diff --git a/drivers/staging/media/imx/imx7-media-csi.c 
> b/drivers/staging/media/imx/imx7-media-csi.c
> index c1cf80bcad64..d775e259fece 100644
> --- a/drivers/staging/media/imx/imx7-media-csi.c
> +++ b/drivers/staging/media/imx/imx7-media-csi.c
> @@ -1036,6 +1036,7 @@ static int imx7_csi_set_fmt(struct 
> v4l2_subdev *sd,
>  	const struct imx_media_pixfmt *outcc;
>  	struct v4l2_mbus_framefmt *outfmt;
>  	struct v4l2_pix_format vdev_fmt;
> +	struct v4l2_rect vdev_compose;
>  	const struct imx_media_pixfmt *cc;
>  	struct v4l2_mbus_framefmt *fmt;
>  	struct v4l2_subdev_format format;
> @@ -1082,11 +1083,11 @@ static int imx7_csi_set_fmt(struct 
> v4l2_subdev *sd,
>  	csi->cc[sdformat->pad] = cc;
>
>  	/* propagate output pad format to capture device */
> -	imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt,
> +	imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, &vdev_compose,
>  				      &csi->format_mbus[IMX7_CSI_PAD_SRC],
>  				      csi->cc[IMX7_CSI_PAD_SRC]);
>  	mutex_unlock(&csi->lock);
> -	imx_media_capture_device_set_format(vdev, &vdev_fmt);
> +	imx_media_capture_device_set_format(vdev, &vdev_fmt, 
> &vdev_compose);
>
>  	return 0;