From 279d384f95c4c0f0b7862b71e49af314c3432680 Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Wed, 7 Nov 2012 11:45:02 +0530 Subject: [PATCH] --- yaml --- r: 344633 b: refs/heads/master c: 5d501085d4a949c1d60e289d5ed3df9e20acc494 h: refs/heads/master i: 344631: 777e5e2e82f99698a6db5061d34137774c51b8c2 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d220cd3c412f..4cb7f7eaabd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76eed4bcb6f90e77764ec024411d6b409ce7c8a1 +refs/heads/master: 5d501085d4a949c1d60e289d5ed3df9e20acc494 diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index bab9d6b95c32..36ecb91b2452 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -2264,14 +2264,16 @@ static int dispc_ovl_calc_scaling_44xx(enum omap_plane plane, u16 in_height = DIV_ROUND_UP(height, *decim_y); const int maxsinglelinewidth = dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH); - unsigned long pclk = dispc_plane_pclk_rate(plane); const int maxdownscale = dss_feat_get_param_max(FEAT_PARAM_DOWNSCALE); - if (mem_to_mem) - in_width_max = DIV_ROUND_UP(out_width, maxdownscale); - else + if (mem_to_mem) { + in_width_max = out_width * maxdownscale; + } else { + unsigned long pclk = dispc_plane_pclk_rate(plane); + in_width_max = dispc_core_clk_rate() / DIV_ROUND_UP(pclk, out_width); + } *decim_x = DIV_ROUND_UP(width, in_width_max);