OMAP: DSS2: Use PM runtime & HWMOD support

Use PM runtime and HWMOD support to handle enabling and disabling of DSS
modules.

Each DSS module will have get and put functions which can be used to
enable and disable that module. The functions use pm_runtime and hwmod
opt-clocks to enable the hardware.

Acked-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 47 insertions, 23 deletions

diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c
index bab55cd4ac9a..f053b180ecd7 100644
--- a/drivers/video/omap2/dss/dpi.c
+++ b/drivers/video/omap2/dss/dpi.c
@@ -23,7 +23,6 @@
 #define DSS_SUBSYS_NAME "DPI"
 
 #include <linux/kernel.h>
-#include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
@@ -130,8 +129,6 @@ static int dpi_set_mode(struct omap_dss_device *dssdev)
         bool is_tft;
         int r = 0;
 
-        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK);
-
         dispc_set_pol_freq(dssdev->manager->id, dssdev->panel.config,
                         dssdev->panel.acbi, dssdev->panel.acb);
 
@@ -144,7 +141,7 @@ static int dpi_set_mode(struct omap_dss_device *dssdev)
                 r = dpi_set_dispc_clk(dssdev, is_tft, t->pixel_clock * 1000,
                                 &fck, &lck_div, &pck_div);
         if (r)
-                goto err0;
+                return r;
 
         pck = fck / lck_div / pck_div / 1000;
 
@@ -158,12 +155,10 @@ static int dpi_set_mode(struct omap_dss_device *dssdev)
 
         dispc_set_lcd_timings(dssdev->manager->id, t);
 
-err0:
-        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);
-        return r;
+        return 0;
 }
 
-static int dpi_basic_init(struct omap_dss_device *dssdev)
+static void dpi_basic_init(struct omap_dss_device *dssdev)
 {
         bool is_tft;
 
@@ -175,8 +170,6 @@ static int dpi_basic_init(struct omap_dss_device *dssdev)
                         OMAP_DSS_LCD_DISPLAY_TFT : OMAP_DSS_LCD_DISPLAY_STN);
         dispc_set_tft_data_lines(dssdev->manager->id,
                         dssdev->phy.dpi.data_lines);
-
-        return 0;
 }
 
 int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
@@ -186,30 +179,38 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
         r = omap_dss_start_device(dssdev);
         if (r) {
                 DSSERR("failed to start device\n");
-                goto err0;
+                goto err_start_dev;
         }
 
         if (cpu_is_omap34xx()) {
                 r = regulator_enable(dpi.vdds_dsi_reg);
                 if (r)
-                        goto err1;
+                        goto err_reg_enable;
         }
 
-        dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK);
+        r = dss_runtime_get();
+        if (r)
+                goto err_get_dss;
 
-        r = dpi_basic_init(dssdev);
+        r = dispc_runtime_get();
         if (r)
-                goto err2;
+                goto err_get_dispc;
+
+        dpi_basic_init(dssdev);
 
         if (dpi_use_dsi_pll(dssdev)) {
+                r = dsi_runtime_get(dpi.dsidev);
+                if (r)
+                        goto err_get_dsi;
+
                 r = dsi_pll_init(dpi.dsidev, 0, 1);
                 if (r)
-                        goto err2;
+                        goto err_dsi_pll_init;
         }
 
         r = dpi_set_mode(dssdev);
         if (r)
-                goto err3;
+                goto err_set_mode;
 
         mdelay(2);
 
@@ -217,16 +218,22 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev)
 
         return 0;
 
-err3:
+err_set_mode:
         if (dpi_use_dsi_pll(dssdev))
                 dsi_pll_uninit(dpi.dsidev, true);
-err2:
-        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);
+err_dsi_pll_init:
+        if (dpi_use_dsi_pll(dssdev))
+                dsi_runtime_put(dpi.dsidev);
+err_get_dsi:
+        dispc_runtime_put();
+err_get_dispc:
+        dss_runtime_put();
+err_get_dss:
         if (cpu_is_omap34xx())
                 regulator_disable(dpi.vdds_dsi_reg);
-err1:
+err_reg_enable:
         omap_dss_stop_device(dssdev);
-err0:
+err_start_dev:
         return r;
 }
 EXPORT_SYMBOL(omapdss_dpi_display_enable);
@@ -238,9 +245,11 @@ void omapdss_dpi_display_disable(struct omap_dss_device *dssdev)
         if (dpi_use_dsi_pll(dssdev)) {
                 dss_select_dispc_clk_source(OMAP_DSS_CLK_SRC_FCK);
                 dsi_pll_uninit(dpi.dsidev, true);
+                dsi_runtime_put(dpi.dsidev);
         }
 
-        dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);
+        dispc_runtime_put();
+        dss_runtime_put();
 
         if (cpu_is_omap34xx())
                 regulator_disable(dpi.vdds_dsi_reg);
@@ -252,11 +261,26 @@ EXPORT_SYMBOL(omapdss_dpi_display_disable);
 void dpi_set_timings(struct omap_dss_device *dssdev,
                         struct omap_video_timings *timings)
 {
+        int r;
+
         DSSDBG("dpi_set_timings\n");
         dssdev->panel.timings = *timings;
         if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+                r = dss_runtime_get();
+                if (r)
+                        return;
+
+                r = dispc_runtime_get();
+                if (r) {
+                        dss_runtime_put();
+                        return;
+                }
+
                 dpi_set_mode(dssdev);
                 dispc_go(dssdev->manager->id);
+
+                dispc_runtime_put();
+                dss_runtime_put();
         }
 }
 EXPORT_SYMBOL(dpi_set_timings);