From a68c7d6a195c6cdf451ef853b22a981f59bc6753 Mon Sep 17 00:00:00 2001 From: Chandrabhanu Mahapatra Date: Mon, 24 Sep 2012 12:08:27 +0530 Subject: [PATCH] --- yaml --- r: 333571 b: refs/heads/master c: d557a9cf2f4f9286759cdd1937ce98641fa35583 h: refs/heads/master i: 333569: 983232b5066eb1cb9f3edbbb0a6715c6b5711195 333567: c3ac1f229d6e41722b2c514b9dab4279684ab537 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9680ee47137f..49550192b133 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 406f7b8baa8f92d88dac448a9dc0dbeb3e330874 +refs/heads/master: d557a9cf2f4f9286759cdd1937ce98641fa35583 diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index e52c57789383..2137d2a2cc5d 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -2195,7 +2195,8 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane, const struct omap_video_timings *mgr_timings, u16 width, u16 height, u16 out_width, u16 out_height, enum omap_color_mode color_mode, bool *five_taps, - int *x_predecim, int *y_predecim, u16 pos_x) + int *x_predecim, int *y_predecim, u16 pos_x, + enum omap_dss_rotation_type rotation_type) { struct omap_overlay *ovl = omap_dss_get_overlay(plane); const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE); @@ -2210,7 +2211,8 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane, return -EINVAL; *x_predecim = max_decim_limit; - *y_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 || @@ -2306,7 +2308,8 @@ int dispc_ovl_setup(enum omap_plane plane, struct omap_overlay_info *oi, r = dispc_ovl_calc_scaling(plane, channel, mgr_timings, in_width, in_height, out_width, out_height, oi->color_mode, - &five_taps, &x_predecim, &y_predecim, oi->pos_x); + &five_taps, &x_predecim, &y_predecim, oi->pos_x, + oi->rotation_type); if (r) return r;