OMAPDSS: DISPC: Fix scaling constraints for OMAP4

The calculation of required DISPC_FCLK for downscaling is done by multplying the
pixel clock with an integer factor. This isn't true for OMAP4 where the required
clock is calculated using the exact ratio of downscaling done.

Fix this calculation for OMAP4. Also, do a minor clean up of calc_fclk().

Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index d8e044df3d40a20adaa960d476db7cc7eaafe7a0..22023bba63e6e13d18dd26d8ccc34696df69d212 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -1694,6 +1694,7 @@ static unsigned long calc_fclk(enum omap_channel channel, u16 width,
                u16 height, u16 out_width, u16 out_height)
 {
        unsigned int hf, vf;
+       unsigned long pclk = dispc_mgr_pclk_rate(channel);
 
        /*
         * FIXME how to determine the 'A' factor
@@ -1716,13 +1717,16 @@ static unsigned long calc_fclk(enum omap_channel channel, u16 width,
 
        if (cpu_is_omap24xx()) {
                if (vf > 1 && hf > 1)
-                       return dispc_mgr_pclk_rate(channel) * 4;
+                       return pclk * 4;
                else
-                       return dispc_mgr_pclk_rate(channel) * 2;
+                       return pclk * 2;
        } else if (cpu_is_omap34xx()) {
-               return dispc_mgr_pclk_rate(channel) * vf * hf;
+               return pclk * vf * hf;
        } else {
-               return dispc_mgr_pclk_rate(channel) * hf;
+               if (hf > 1)
+                       return DIV_ROUND_UP(pclk, out_width) * width;
+               else
+                       return pclk;
        }
 }