瀏覽代碼

OMAP: DSS2: adjust YUV overlay width to be even

An overlay in YUV mode has to have an even input width, because data for
each pixel is divided between two adjacent pixels.

The algorithm handling manual update overlay adjusting may adjust the
overlay width to be odd.

This patch adds a check for that situation, and makes the width even.
The width is increased by one if it is possible (the unadjusted input
width is larger than the width), and decreased by one if increasing is
not possible.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Tomi Valkeinen 15 年之前
父節點
當前提交
f55fdcfe88
共有 1 個文件被更改,包括 15 次插入0 次删除
  1. 15 0
      drivers/video/omap2/dss/manager.c

+ 15 - 0
drivers/video/omap2/dss/manager.c

@@ -813,6 +813,21 @@ static int configure_overlay(enum omap_plane plane)
 
 		w = w * outw / orig_outw;
 		h = h * outh / orig_outh;
+
+		/* YUV mode overlay's input width has to be even and the
+		 * algorithm above may adjust the width to be odd.
+		 *
+		 * Here we adjust the width if needed, preferring to increase
+		 * the width if the original width was bigger.
+		 */
+		if ((w & 1) &&
+				(c->color_mode == OMAP_DSS_COLOR_YUV2 ||
+				 c->color_mode == OMAP_DSS_COLOR_UYVY)) {
+			if (orig_w > w)
+				w += 1;
+			else
+				w -= 1;
+		}
 	}
 
 	r = dispc_setup_plane(plane,