3 files changed, 15 insertions, 2 deletions

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index fedbd2c8e97a..08137a8a38cb 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -2970,7 +2970,7 @@ unsigned long dispc_fclk_rate(void)
 
         switch (dss_get_dispc_clk_source()) {
         case OMAP_DSS_CLK_SRC_FCK:
-                r = clk_get_rate(dispc.dss_clk);
+                r = dss_get_dispc_clk_rate();
                 break;
         case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
                 dsidev = dsi_get_dsidev_from_id(0);
@@ -3002,7 +3002,7 @@ unsigned long dispc_mgr_lclk_rate(enum omap_channel channel)
 
                 switch (dss_get_lcd_clk_source(channel)) {
                 case OMAP_DSS_CLK_SRC_FCK:
-                        r = clk_get_rate(dispc.dss_clk);
+                        r = dss_get_dispc_clk_rate();
                         break;
                 case OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC:
                         dsidev = dsi_get_dsidev_from_id(0);
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 833f1627dc76..054c2a22b3f1 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -77,6 +77,7 @@ static struct {
 
         struct clk      *dpll4_m4_ck;
         struct clk      *dss_clk;
+        unsigned long   dss_clk_rate;
 
         unsigned long   cache_req_pck;
         unsigned long   cache_prate;
@@ -489,6 +490,10 @@ int dss_set_clock_div(struct dss_clock_info *cinfo)
                         return -EINVAL;
         }
 
+        dss.dss_clk_rate = clk_get_rate(dss.dss_clk);
+
+        WARN_ONCE(dss.dss_clk_rate != cinfo->fck, "clk rate mismatch");
+
         DSSDBG("fck = %ld (%d)\n", cinfo->fck, cinfo->fck_div);
 
         return 0;
@@ -502,6 +507,11 @@ unsigned long dss_get_dpll4_rate(void)
                 return 0;
 }
 
+unsigned long dss_get_dispc_clk_rate(void)
+{
+        return dss.dss_clk_rate;
+}
+
 static int dss_setup_default_clock(void)
 {
         unsigned long max_dss_fck, prate;
@@ -953,6 +963,8 @@ static int __init omap_dsshw_probe(struct platform_device *pdev)
         if (r)
                 goto err_runtime_get;
 
+        dss.dss_clk_rate = clk_get_rate(dss.dss_clk);
+
         /* Select DPLL */
         REG_FLD_MOD(DSS_CONTROL, 0, 0, 0);
 
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index ebe9e08b2a91..610c8e563daa 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -237,6 +237,7 @@ void dss_overlay_kobj_uninit(struct omap_overlay *ovl);
 int dss_init_platform_driver(void) __init;
 void dss_uninit_platform_driver(void);
 
+unsigned long dss_get_dispc_clk_rate(void);
 int dss_dpi_select_source(enum omap_channel channel);
 void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select);
 enum dss_hdmi_venc_clk_source_select dss_get_hdmi_venc_clk_source(void);