DISPC_FCLK is incorrectly used as functional clock of DISPC in scaling
calculations. So, DISPC_CORE_CLK replaces as functional clock of DISPC.
DISPC_CORE_CLK is derived from DISPC_FCLK divided by an independent DISPC
divisor LCD.

Signed-off-by: Chandrabhanu Mahapatra <[email protected]>
---
 drivers/video/omap2/dss/dispc.c |   28 ++++++++++++++++++++++------
 drivers/video/omap2/dss/dss.h   |    1 +
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 17ffa71..cfde674 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -1813,6 +1813,7 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
                                dss_feat_get_param_max(FEAT_PARAM_LINEWIDTH);
        const int max_decim_limit = 16;
        unsigned long fclk = 0;
+       unsigned long dispc_core_clk = dispc_core_clk_rate(channel);
        int decim_x, decim_y, error, min_factor;
        u16 in_width, in_height, in_width_max = 0;
 
@@ -1855,7 +1856,7 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
                        fclk = calc_fclk(channel, in_width, in_height,
                                        out_width, out_height);
                        error = (in_width > maxsinglelinewidth || !fclk ||
-                               fclk > dispc_fclk_rate());
+                               fclk > dispc_core_clk);
                        if (error) {
                                if (decim_x == decim_y) {
                                        decim_x = min_factor;
@@ -1893,7 +1894,7 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
                                        out_width, out_height);
                        error = (error || in_width > maxsinglelinewidth * 2 ||
                                (in_width > maxsinglelinewidth && *five_taps) ||
-                               !fclk || fclk > dispc_fclk_rate());
+                               !fclk || fclk > dispc_core_clk);
                        if (error) {
                                if (decim_x == decim_y) {
                                        decim_x = min_factor;
@@ -1926,7 +1927,7 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
        } else {
                int decim_x_min = decim_x;
                in_height = DIV_ROUND_UP(height, decim_y);
-               in_width_max = dispc_fclk_rate() /
+               in_width_max = dispc_core_clk /
                                DIV_ROUND_UP(dispc_mgr_pclk_rate(channel),
                                                out_width);
                decim_x = DIV_ROUND_UP(width, in_width_max);
@@ -1950,13 +1951,13 @@ static int dispc_ovl_calc_scaling(enum omap_plane plane,
        }
 
        DSSDBG("required fclk rate = %lu Hz\n", fclk);
-       DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate());
+       DSSDBG("current fclk rate = %lu Hz\n", dispc_core_clk);
 
-       if (!fclk || fclk > dispc_fclk_rate()) {
+       if (!fclk || fclk > dispc_core_clk) {
                DSSERR("failed to set up scaling, "
                        "required fclk rate = %lu Hz, "
                        "current fclk rate = %lu Hz\n",
-                       fclk, dispc_fclk_rate());
+                       fclk, dispc_core_clk);
                return -EINVAL;
        }
 
@@ -2646,6 +2647,21 @@ unsigned long dispc_mgr_pclk_rate(enum omap_channel 
channel)
        }
 }
 
+unsigned long dispc_core_clk_rate(enum omap_channel channel)
+{
+       int lcd = 1;
+       unsigned long r = dispc_fclk_rate();
+
+       if (dss_has_feature(FEAT_CORE_CLK_DIV)) {
+               lcd = REG_GET(DISPC_DIVISOR, 23, 16);
+       } else {
+               if (dispc_mgr_is_lcd(channel))
+                       lcd = REG_GET(DISPC_DIVISORo(channel), 23, 16);
+       }
+
+       return r / lcd ;
+}
+
 void dispc_dump_clocks(struct seq_file *s)
 {
        int lcd, pcd;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index d4b3dff..4748923 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -451,6 +451,7 @@ void dispc_mgr_set_pol_freq(enum omap_channel channel,
                enum omap_panel_config config, u8 acbi, u8 acb);
 unsigned long dispc_mgr_lclk_rate(enum omap_channel channel);
 unsigned long dispc_mgr_pclk_rate(enum omap_channel channel);
+unsigned long dispc_core_clk_rate(enum omap_channel channel);
 int dispc_mgr_set_clock_div(enum omap_channel channel,
                struct dispc_clock_info *cinfo);
 int dispc_mgr_get_clock_div(enum omap_channel channel,
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to