diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-03-17 15:31:09 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-17 15:38:43 +0300 |
| commit | f5a734827b07dc907ae95698f91d4b1eaafe9a8a (patch) | |
| tree | ec49200adef717a40b7f2a4c3bb9ea83d3e2e076 /drivers/video/fbdev | |
| parent | c4661b33181708cddb96c72f629eae9cdeea271f (diff) | |
| download | blackbird-op-linux-f5a734827b07dc907ae95698f91d4b1eaafe9a8a.tar.gz blackbird-op-linux-f5a734827b07dc907ae95698f91d4b1eaafe9a8a.zip | |
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>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/dispc.c | 4 |
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: } } 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; } |
