From 34b9576d13d553c98535866366d73270cb37b248 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Wed, 7 Nov 2012 11:45:03 +0530 Subject: [PATCH] --- yaml --- r: 344634 b: refs/heads/master c: 1c031441a95eef928220403b6c3a2dd00d09dcdc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4cb7f7eaabd7..da18dfb1390d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d501085d4a949c1d60e289d5ed3df9e20acc494 +refs/heads/master: 1c031441a95eef928220403b6c3a2dd00d09dcdc diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index 36ecb91b2452..34ada45dfa84 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -2315,9 +2315,14 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane, if ((caps & OMAP_DSS_OVL_CAP_SCALE) == 0) return -EINVAL; - *x_predecim = max_decim_limit; - *y_predecim = (rotation_type == OMAP_DSS_ROT_TILER && - dss_has_feature(FEAT_BURST_2D)) ? 2 : max_decim_limit; + if (plane == OMAP_DSS_WB) { + *x_predecim = *y_predecim = 1; + } else { + *x_predecim = max_decim_limit; + *y_predecim = (rotation_type == OMAP_DSS_ROT_TILER && + dss_has_feature(FEAT_BURST_2D)) ? + 2 : max_decim_limit; + } if (color_mode == OMAP_DSS_COLOR_CLUT1 || color_mode == OMAP_DSS_COLOR_CLUT2 ||