From 05c2eafe7b2daea60794723472fd57857b7e04df Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 15 May 2012 15:54:15 +0300 Subject: [PATCH] --- yaml --- r: 310368 b: refs/heads/master c: 36377357db00f8660039578ba57a2a19bfc9ad3d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 57be2ccfea51..d137ea4f262f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3568f2a46f2a73bab18c914df06afd98a97e0e0e +refs/heads/master: 36377357db00f8660039578ba57a2a19bfc9ad3d diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index ac71fec1dbba..0fa1c94e8c58 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -1304,9 +1304,6 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane, int scale_x = out_width != orig_width; int scale_y = out_height != orig_height; - dispc_ovl_set_accu_uv(plane, orig_width, orig_height, out_width, - out_height, ilace, color_mode, rotation); - if (!dss_has_feature(FEAT_HANDLE_UV_SEPARATE)) return; if ((color_mode != OMAP_DSS_COLOR_YUV2 && @@ -1316,6 +1313,10 @@ static void dispc_ovl_set_scaling_uv(enum omap_plane plane, REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 8, 8); return; } + + dispc_ovl_set_accu_uv(plane, orig_width, orig_height, out_width, + out_height, ilace, color_mode, rotation); + switch (color_mode) { case OMAP_DSS_COLOR_NV12: /* UV is subsampled by 2 vertically*/