Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6aaac7f authored by Jan Luebbe's avatar Jan Luebbe Committed by Mauro Carvalho Chehab
Browse files

media: imx: capture: refactor enum_/try_fmt 



By checking and handling the internal IPU formats (ARGB or AYUV) first,
we don't need to check whether it's a bayer format, as we can default to
passing the input format on in all other cases.

This simplifies handling the different configurations for RGB565 between
parallel and MIPI CSI-2, as we don't need to check the details of the
format anymore.

Signed-off-by: default avatarJan Luebbe <jlu@pengutronix.de>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarSteve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 56e5faf2

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

+18 −20
Original line number Diff line number Diff line
@@ -170,23 +170,22 @@ static int capture_enum_fmt_vid_cap(struct file *file, void *fh, 
	}



	cc_src = imx_media_find_ipu_format(fmt_src.format.code, CS_SEL_ANY);

	if (!cc_src)

	if (cc_src) {

		u32 cs_sel = (cc_src->cs == IPUV3_COLORSPACE_YUV) ?

			CS_SEL_YUV : CS_SEL_RGB;



		ret = imx_media_enum_format(&fourcc, f->index, cs_sel);

		if (ret)

			return ret;

	} else {

		cc_src = imx_media_find_mbus_format(fmt_src.format.code,

						    CS_SEL_ANY, true);

	if (!cc_src)

		if (WARN_ON(!cc_src))

			return -EINVAL;



	if (cc_src->bayer) {

		if (f->index != 0)

			return -EINVAL;

		fourcc = cc_src->fourcc;

	} else {

		u32 cs_sel = (cc_src->cs == IPUV3_COLORSPACE_YUV) ?

			CS_SEL_YUV : CS_SEL_RGB;



		ret = imx_media_enum_format(&fourcc, f->index, cs_sel);

		if (ret)

			return ret;

	}



	f->pixelformat = fourcc;
@@ -219,15 +218,7 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh, 
		return ret;



	cc_src = imx_media_find_ipu_format(fmt_src.format.code, CS_SEL_ANY);

	if (!cc_src)

		cc_src = imx_media_find_mbus_format(fmt_src.format.code,

						    CS_SEL_ANY, true);

	if (!cc_src)

		return -EINVAL;



	if (cc_src->bayer) {

		cc = cc_src;

	} else {

	if (cc_src) {

		u32 fourcc, cs_sel;



		cs_sel = (cc_src->cs == IPUV3_COLORSPACE_YUV) ?
@@ -239,6 +230,13 @@ static int capture_try_fmt_vid_cap(struct file *file, void *fh, 
			imx_media_enum_format(&fourcc, 0, cs_sel);

			cc = imx_media_find_format(fourcc, cs_sel, false);

		}

	} else {

		cc_src = imx_media_find_mbus_format(fmt_src.format.code,

						    CS_SEL_ANY, true);

		if (WARN_ON(!cc_src))

			return -EINVAL;



		cc = cc_src;

	}



	imx_media_mbus_fmt_to_pix_fmt(&f->fmt.pix, &fmt_src.format, cc);