Commit f5a73482 authored Mar 17, 2015 by Tomi Valkeinen

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>

parent c4661b33

drivers/video/fbdev/omap2/dss/dispc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2338,8 +2338,8 @@ static int dispc_ovl_calc_scaling_34xx(unsigned long pclk, unsigned long lclk,
		}
		} while (decim_x <= x_predecim && decim_y <= y_predecim && error);

		if (check_horiz_timing_omap3(pclk, lclk, mgr_timings, pos_x, width,
		height, out_width, out_height, *five_taps)) {
		if (check_horiz_timing_omap3(pclk, lclk, mgr_timings, pos_x, in_width,
		in_height, out_width, out_height, *five_taps)) {
		DSSERR("horizontal timing too tight\n");
		return -EINVAL;
		}