From 3d3666eb5966b2230dad0d48ef0bd8a692cda4fc Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Mon, 12 Nov 2012 16:28:59 +0100 Subject: [PATCH] --- yaml --- r: 337839 b: refs/heads/master c: c096ae130e97ffb45a902dba3c4ab07a37006091 h: refs/heads/master i: 337837: 0c7bbdc8a87a9092992e892b85247d5a3d988637 337835: fd034d8bd20511219136ade7b9046072728dff9e 337831: 5d377e58f5be350a55b29c3cdb86e4713c3c1a11 337823: b5c49f8e21880c95a76a9e4eed235debbf953b9f v: v3 --- [refs] | 2 +- trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b4d806ce039c..8a947b3f11e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3c75e8dc81b6482ea230d03bbddddd38db9ab35 +refs/heads/master: c096ae130e97ffb45a902dba3c4ab07a37006091 diff --git a/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c index 27e77c72c9ca..41fe11642703 100644 --- a/trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c +++ b/trunk/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: