From: Tomi Valkeinen Date: Tue, 17 Mar 2015 13:31:09 +0000 (+0200) Subject: OMAPDSS: DISPC: fix check_horiz_timing_omap3 args X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f5a734827b07dc907ae95698f91d4b1eaafe9a8a;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 --- 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: } } 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; }