diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-11-04 17:10:51 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-29 11:06:27 +0200 |
| commit | fd2eac5a66e5830e99324ba65a33d883cfd31d9e (patch) | |
| tree | b6cca955edffcff06570a19dca12a6da184b5fe7 /drivers/video | |
| parent | ecb0b366af3fb435b877d5648b363e069e97a754 (diff) | |
| download | lwn-fd2eac5a66e5830e99324ba65a33d883cfd31d9e.tar.gz lwn-fd2eac5a66e5830e99324ba65a33d883cfd31d9e.zip | |
OMAPDSS: skip pclk check for WB mem2mem
When doing mem-to-mem writeback, there's no pixelclock. However, the
code that calculates scaling factors check that there is a pixel clock.
We can just skip the check when doing mem-to-mem writeback.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/omap2/dss/dispc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c index 3cd78dcfefc5..837b1f508d79 100644 --- a/drivers/video/fbdev/omap2/dss/dispc.c +++ b/drivers/video/fbdev/omap2/dss/dispc.c @@ -2477,7 +2477,7 @@ static int dispc_ovl_calc_scaling(unsigned long pclk, unsigned long lclk, if (width == out_width && height == out_height) return 0; - if (pclk == 0 || mgr_timings->pixelclock == 0) { + if (!mem_to_mem && (pclk == 0 || mgr_timings->pixelclock == 0)) { DSSERR("cannot calculate scaling settings: pclk is zero\n"); return -EINVAL; } |