Commit 82bedfbf authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: imx: utils: Add ability to filter pixel formats by mbus code 



Add a media bus code argument to the imx_media_enum_pixel_formats(). If
set to a non-zero value, the function will only consider pixel formats
that match the given media bus code.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 0ab05d7f

drivers/staging/media/imx/imx-media-capture.c

+3 −2
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ static int capture_enum_fmt_vid_cap(struct file *file, void *fh, 
			(cc_src->cs == IPUV3_COLORSPACE_YUV) ?

			PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;



		ret = imx_media_enum_pixel_formats(&fourcc, f->index, fmt_sel);

		ret = imx_media_enum_pixel_formats(&fourcc, f->index, fmt_sel,

						   0);

		if (ret)

			return ret;

	} else {
@@ -223,7 +224,7 @@ static int __capture_try_fmt_vid_cap(struct capture_priv *priv, 


		cc = imx_media_find_pixel_format(fourcc, fmt_sel);

		if (!cc) {

			imx_media_enum_pixel_formats(&fourcc, 0, fmt_sel);

			imx_media_enum_pixel_formats(&fourcc, 0, fmt_sel, 0);

			cc = imx_media_find_pixel_format(fourcc, fmt_sel);

		}

	} else {

drivers/staging/media/imx/imx-media-csc-scaler.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int ipu_csc_scaler_enum_fmt(struct file *file, void *fh, 
	int ret;



	ret = imx_media_enum_pixel_formats(&fourcc, f->index,

					   PIXFMT_SEL_YUV_RGB);

					   PIXFMT_SEL_YUV_RGB, 0);

	if (ret)

		return ret;

drivers/staging/media/imx/imx-media-utils.c

+22 −1
Original line number Diff line number Diff line
@@ -283,9 +283,11 @@ EXPORT_SYMBOL_GPL(imx_media_find_mbus_format); 
 * @index: The requested match index.

 * @fmt_sel: Include in the enumeration entries with the given selection

 *           criteria.

 * @code: If non-zero, only include in the enumeration entries matching this

 *	media bus code.

 */

int imx_media_enum_pixel_formats(u32 *fourcc, u32 index,

				 enum imx_pixfmt_sel fmt_sel)

				 enum imx_pixfmt_sel fmt_sel, u32 code)

{

	bool sel_ipu = fmt_sel & PIXFMT_SEL_IPU;

	unsigned int i;
@@ -306,6 +308,25 @@ int imx_media_enum_pixel_formats(u32 *fourcc, u32 index, 
		if (!(fmt_sel & sel))

			continue;



		/*

		 * If a media bus code is specified, only consider formats that

		 * match it.

		 */

		if (code) {

			unsigned int j;



			if (!fmt->codes)

				continue;



			for (j = 0; fmt->codes[j]; j++) {

				if (code == fmt->codes[j])

					break;

			}



			if (!fmt->codes[j])

				continue;

		}



		if (index == 0) {

			*fourcc = fmt->fourcc;

			return 0;

drivers/staging/media/imx/imx-media.h

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ struct imx_media_dev { 
const struct imx_media_pixfmt *

imx_media_find_pixel_format(u32 fourcc, enum imx_pixfmt_sel sel);

int imx_media_enum_pixel_formats(u32 *fourcc, u32 index,

				 enum imx_pixfmt_sel sel);

				 enum imx_pixfmt_sel sel, u32 code);

const struct imx_media_pixfmt *

imx_media_find_mbus_format(u32 code, enum imx_pixfmt_sel sel);

int imx_media_enum_mbus_formats(u32 *code, u32 index,