[PATCH 131/133] [Jaunty SRU] ARM.imx51 Freescale:ENGR00113478 IPUv1:Fix video play break without resizing and rotation

[Brad Figg]

From: Liu Ying <b17645 at freescale.com>

IPUv1 needs IC module to do CSC even if
there is no resizing and rotation requirement,
so we cannot bypass IC in this case.

Signed-off-by: Liu Ying <b17645 at freescale.com>
Signed-off-by: Brad Figg <brad.figg at canonical.com>
---
 drivers/media/video/mxc/output/mxc_v4l2_output.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/mxc/output/mxc_v4l2_output.c b/drivers/media/video/mxc/output/mxc_v4l2_output.c
index 4c70599..1bb271d 100644
--- a/drivers/media/video/mxc/output/mxc_v4l2_output.c
+++ b/drivers/media/video/mxc/output/mxc_v4l2_output.c
@@ -907,6 +907,13 @@ static int mxc_v4l2out_streamon(vout_data * vout)
 			vout->ic_bypass = 0;
 		}
 
+#ifdef CONFIG_MXC_IPU_V1
+		/* IPUv1 needs IC to do CSC */
+		if (format_is_yuv(vout->v2f.fmt.pix.pixelformat) !=
+		    format_is_yuv(bpp_to_fmt(fbi)))
+			vout->ic_bypass = 0;
+#endif
+
 		fbvar = fbi->var;
 
 		if (vout->cur_disp_output == 3) {
-- 
1.6.0.4