OMAPDSS: DISPC: fix predecimation for YUV modes

DISPC needs even input buffer width for YUV modes. The DISPC driver
doesn't check this at the moment (although omapdrm does), but worse,
when DISPC driver does x predecimation the result may be uneven. This
causes sometimes sync losts, underflows, or just visual errors.

This patch makes DISPC driver return an error if the user gives uneven
input width for a YUV buffer. It also makes the input width even in case
of predecimation.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index a074d8b7059187b7e32554637fe49883d47586ca..db60aa98f661ef55c27dda215799a9780b3fef2e 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -2542,6 +2542,21 @@ static int dispc_ovl_setup_common(enum omap_plane plane,
        if (paddr == 0 && rotation_type != OMAP_DSS_ROT_TILER)
                return -EINVAL;
 
+       switch (color_mode) {
+       case OMAP_DSS_COLOR_YUV2:
+       case OMAP_DSS_COLOR_UYVY:
+       case OMAP_DSS_COLOR_NV12:
+               if (in_width & 1) {
+                       DSSERR("input width %d is not even for YUV format\n",
+                               in_width);
+                       return -EINVAL;
+               }
+               break;
+
+       default:
+               break;
+       }
+
        out_width = out_width == 0 ? width : out_width;
        out_height = out_height == 0 ? height : out_height;
 
@@ -2572,6 +2587,27 @@ static int dispc_ovl_setup_common(enum omap_plane plane,
        in_width = in_width / x_predecim;
        in_height = in_height / y_predecim;
 
+       if (x_predecim > 1 || y_predecim > 1)
+               DSSDBG("predecimation %d x %x, new input size %d x %d\n",
+                       x_predecim, y_predecim, in_width, in_height);
+
+       switch (color_mode) {
+       case OMAP_DSS_COLOR_YUV2:
+       case OMAP_DSS_COLOR_UYVY:
+       case OMAP_DSS_COLOR_NV12:
+               if (in_width & 1) {
+                       DSSDBG("predecimated input width is not even for YUV format\n");
+                       DSSDBG("adjusting input width %d -> %d\n",
+                               in_width, in_width & ~1);
+
+                       in_width &= ~1;
+               }
+               break;
+
+       default:
+               break;
+       }
+
        if (color_mode == OMAP_DSS_COLOR_YUV2 ||
                        color_mode == OMAP_DSS_COLOR_UYVY ||
                        color_mode == OMAP_DSS_COLOR_NV12)