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

Commit 7c3a2066 authored by Michael Grzeschik's avatar Michael Grzeschik Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: mx2_camera: remove emma limitation for RGB565 



In the current source status the emma has no limitation for any PIXFMT
since the data is parsed raw and unprocessed into the memory.

Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ec73365b

drivers/media/video/mx2_camera.c

+5 −10
Original line number Diff line number Diff line
@@ -716,8 +716,11 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd, 
	/*

	 * We only use the EMMA engine to get rid of the broken

	 * DMA Engine. No color space consversion at the moment.

	 * We adjust incoming and outgoing pixelformat to rgb16

	 * and adjust the bytesperline accordingly.

	 * We set the incomming and outgoing pixelformat to an

	 * 16 Bit wide format and adjust the bytesperline

	 * accordingly. With this configuration the inputdata

	 * will not be changed by the emma and could be any type

	 * of 16 Bit Pixelformat.

	 */

	writel(PRP_CNTL_CH1EN |

			PRP_CNTL_CSIEN |
@@ -903,10 +906,6 @@ static int mx2_camera_set_fmt(struct soc_camera_device *icd, 
		return -EINVAL;

	}



	/* eMMA can only do RGB565 */

	if (mx27_camera_emma(pcdev) && pix->pixelformat != V4L2_PIX_FMT_RGB565)

		return -EINVAL;



	mf.width	= pix->width;

	mf.height	= pix->height;

	mf.field	= pix->field;
@@ -950,10 +949,6 @@ static int mx2_camera_try_fmt(struct soc_camera_device *icd, 


	/* FIXME: implement MX27 limits */



	/* eMMA can only do RGB565 */

	if (mx27_camera_emma(pcdev) && pixfmt != V4L2_PIX_FMT_RGB565)

		return -EINVAL;



	/* limit to MX25 hardware capabilities */

	if (cpu_is_mx25()) {

		if (xlate->host_fmt->bits_per_sample <= 8)