summaryrefslogtreecommitdiffstats
path: root/drivers/staging/imx-drm
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-11-12 16:28:59 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-13 15:07:32 -0800
commitc096ae130e97ffb45a902dba3c4ab07a37006091 (patch)
tree0e3146a1c19756715979037b1fda9153b1f9c15e /drivers/staging/imx-drm
parentd3c75e8dc81b6482ea230d03bbddddd38db9ab35 (diff)
downloadop-kernel-dev-c096ae130e97ffb45a902dba3c4ab07a37006091.zip
op-kernel-dev-c096ae130e97ffb45a902dba3c4ab07a37006091.tar.gz
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 <m.olbrich@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm')
-rw-r--r--drivers/staging/imx-drm/ipu-v3/ipu-common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c
index 27e77c7..41fe116 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:
OpenPOWER on IntegriCloud