[PATCH 2/4] media: imx: allow bayer pixel formats to be looked up

[Steve Longerbeam]

This is good too, but if it's all right with you I would prefer to
squash this with the "redo  pixel format enumeration and
negotiation" patch, to keep the patch count down.

Steve


On 03/19/2017 03:48 AM, Russell King wrote:
> Allow imx_media_find_format() to look up bayer formats, which is
> required to support frame size and interval enumeration.
>
> Signed-off-by: Russell King <rmk+kernel at armlinux.org.uk>
> ---
>   drivers/staging/media/imx/imx-media-capture.c | 11 ++++++-----
>   drivers/staging/media/imx/imx-media-utils.c   |  6 +++---
>   drivers/staging/media/imx/imx-media.h         |  2 +-
>   3 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c
> index ee914396080f..cdeb2cd8b1d7 100644
> --- a/drivers/staging/media/imx/imx-media-capture.c
> +++ b/drivers/staging/media/imx/imx-media-capture.c
> @@ -164,10 +164,10 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh,
>   			CS_SEL_YUV : CS_SEL_RGB;
>   		fourcc = f->fmt.pix.pixelformat;
>   
> -		cc = imx_media_find_format(fourcc, cs_sel);
> +		cc = imx_media_find_format(fourcc, cs_sel, false);
>   		if (!cc) {
>   			imx_media_enum_format(&fourcc, 0, cs_sel);
> -			cc = imx_media_find_format(fourcc, cs_sel);
> +			cc = imx_media_find_format(fourcc, cs_sel, false);
>   		}
>   	}
>   
> @@ -193,7 +193,7 @@ static int capture_s_fmt_vid_cap(struct file *file, void *fh,
>   
>   	priv->vdev.fmt.fmt.pix = f->fmt.pix;
>   	priv->vdev.cc = imx_media_find_format(f->fmt.pix.pixelformat,
> -					      CS_SEL_ANY);
> +					      CS_SEL_ANY, false);
>   
>   	return 0;
>   }
> @@ -505,7 +505,8 @@ void imx_media_capture_device_set_format(struct imx_media_video_dev *vdev,
>   
>   	mutex_lock(&priv->mutex);
>   	priv->vdev.fmt.fmt.pix = *pix;
> -	priv->vdev.cc = imx_media_find_format(pix->pixelformat, CS_SEL_ANY);
> +	priv->vdev.cc = imx_media_find_format(pix->pixelformat, CS_SEL_ANY,
> +					      false);
>   	mutex_unlock(&priv->mutex);
>   }
>   EXPORT_SYMBOL_GPL(imx_media_capture_device_set_format);
> @@ -614,7 +615,7 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev)
>   	imx_media_mbus_fmt_to_pix_fmt(&vdev->fmt.fmt.pix,
>   				      &fmt_src.format, NULL);
>   	vdev->cc = imx_media_find_format(vdev->fmt.fmt.pix.pixelformat,
> -					 CS_SEL_ANY);
> +					 CS_SEL_ANY, false);
>   
>   	v4l2_info(sd, "Registered %s as /dev/%s\n", vfd->name,
>   		  video_device_node_name(vfd));
> diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
> index 6eb7e3c5279e..d048e4a080d0 100644
> --- a/drivers/staging/media/imx/imx-media-utils.c
> +++ b/drivers/staging/media/imx/imx-media-utils.c
> @@ -329,9 +329,9 @@ static int enum_format(u32 *fourcc, u32 *code, u32 index,
>   }
>   
>   const struct imx_media_pixfmt *
> -imx_media_find_format(u32 fourcc, enum codespace_sel cs_sel)
> +imx_media_find_format(u32 fourcc, enum codespace_sel cs_sel, bool allow_bayer)
>   {
> -	return find_format(fourcc, 0, cs_sel, true, false);
> +	return find_format(fourcc, 0, cs_sel, true, allow_bayer);
>   }
>   EXPORT_SYMBOL_GPL(imx_media_find_format);
>   
> @@ -524,7 +524,7 @@ int imx_media_ipu_image_to_mbus_fmt(struct v4l2_mbus_framefmt *mbus,
>   {
>   	const struct imx_media_pixfmt *fmt;
>   
> -	fmt = imx_media_find_format(image->pix.pixelformat, CS_SEL_ANY);
> +	fmt = imx_media_find_format(image->pix.pixelformat, CS_SEL_ANY, false);
>   	if (!fmt)
>   		return -EINVAL;
>   
> diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
> index 234242271a13..d8c9536bf1f8 100644
> --- a/drivers/staging/media/imx/imx-media.h
> +++ b/drivers/staging/media/imx/imx-media.h
> @@ -178,7 +178,7 @@ enum codespace_sel {
>   };
>   
>   const struct imx_media_pixfmt *
> -imx_media_find_format(u32 fourcc, enum codespace_sel cs_sel);
> +imx_media_find_format(u32 fourcc, enum codespace_sel cs_sel, bool allow_bayer);
>   int imx_media_enum_format(u32 *fourcc, u32 index, enum codespace_sel cs_sel);
>   const struct imx_media_pixfmt *
>   imx_media_find_mbus_format(u32 code, enum codespace_sel cs_sel,