aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-03-17 09:31:09 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-06-17 08:38:43 -0400
commitf5a734827b07dc907ae95698f91d4b1eaafe9a8a (patch)
treeec49200adef717a40b7f2a4c3bb9ea83d3e2e076
parentc4661b33181708cddb96c72f629eae9cdeea271f (diff)
OMAPDSS: DISPC: fix check_horiz_timing_omap3 args
After calculating the required decimation for scaling, the dispc driver checks once more if the resulting configuration is valid by calling check_horiz_timing_omap3(). Earlier calls to this function have correctly used in_width and in_height as parameters, but the last call uses width and height. This causes the driver to possibly reject scaling that would work. This patch fixes the parameters. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/fbdev/omap2/dss/dispc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index db60aa98f661..cc61513afdb4 100644
--- a/drivers/video/fbdev/omap2/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/dss/dispc.c
@@ -2338,8 +2338,8 @@ again:
2338 } 2338 }
2339 } while (*decim_x <= *x_predecim && *decim_y <= *y_predecim && error); 2339 } while (*decim_x <= *x_predecim && *decim_y <= *y_predecim && error);
2340 2340
2341 if (check_horiz_timing_omap3(pclk, lclk, mgr_timings, pos_x, width, 2341 if (check_horiz_timing_omap3(pclk, lclk, mgr_timings, pos_x, in_width,
2342 height, out_width, out_height, *five_taps)) { 2342 in_height, out_width, out_height, *five_taps)) {
2343 DSSERR("horizontal timing too tight\n"); 2343 DSSERR("horizontal timing too tight\n");
2344 return -EINVAL; 2344 return -EINVAL;
2345 } 2345 }