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>

diff --git a/drivers/video/fbdev/omap2/dss/dispc.c b/drivers/video/fbdev/omap2/dss/dispc.c
index 3cd78dcfefc527a75502299c2bd80b3c285fb051..837b1f508d7978b68c9419466413d59c4b210025 100644 (file)
--- 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;
        }