From: Michael Olbrich Date: Mon, 12 Nov 2012 15:28:59 +0000 (+0100) Subject: staging: drm/imx: Fix YUYV support in i.MX IPUv3 base driver X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c096ae130e97ffb45a902dba3c4ab07a37006091;p=deliverable%2Flinux.git staging: drm/imx: Fix YUYV support in i.MX IPUv3 base driver YVYU is not supported by the IPU, so remove partial handling of this format and replace it with YUYV which is supported. Signed-off-by: Michael Olbrich Signed-off-by: Philipp Zabel Signed-off-by: Sascha Hauer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c index 27e77c72c9ca..41fe11642703 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c @@ -380,6 +380,7 @@ int ipu_cpmem_set_image(struct ipu_ch_param __iomem *cpmem, ipu_cpmem_set_buffer(cpmem, 0, image->phys + y_offset); break; case V4L2_PIX_FMT_UYVY: + case V4L2_PIX_FMT_YUYV: ipu_cpmem_set_buffer(cpmem, 0, image->phys + image->rect.left * 2 + image->rect.top * image->pix.bytesperline); @@ -414,7 +415,7 @@ enum ipu_color_space ipu_pixelformat_to_colorspace(u32 pixelformat) switch (pixelformat) { case V4L2_PIX_FMT_YUV420: case V4L2_PIX_FMT_UYVY: - case V4L2_PIX_FMT_YVYU: + case V4L2_PIX_FMT_YUYV: return IPUV3_COLORSPACE_YUV; case V4L2_PIX_FMT_RGB32: case V4L2_PIX_FMT_BGR32: