Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce17b48 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: DISPC: check if scaling setup failed 



The DISPC's scaling code seems to presume that decimation always
succeeds, and so we always do find a suitable downscaling setup.
However, this is not the case, and the algorithm can fail.

When that happens, the code just proceeds with wrong results, causing
issues later.

Add the necessary checks to bail out if the scaling algorithm failed.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent c582935c

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

+10 −0
Original line number Diff line number Diff line
@@ -2279,6 +2279,11 @@ static int dispc_ovl_calc_scaling_24xx(unsigned long pclk, unsigned long lclk, 
		}

	} while (*decim_x <= *x_predecim && *decim_y <= *y_predecim && error);



	if (error) {

		DSSERR("failed to find scaling settings\n");

		return -EINVAL;

	}



	if (in_width > maxsinglelinewidth) {

		DSSERR("Cannot scale max input width exceeded");

		return -EINVAL;
@@ -2356,6 +2361,11 @@ static int dispc_ovl_calc_scaling_34xx(unsigned long pclk, unsigned long lclk, 
		}

	} while (*decim_x <= *x_predecim && *decim_y <= *y_predecim && error);



	if (error) {

		DSSERR("failed to find scaling settings\n");

		return -EINVAL;

	}



	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");