drm/exynos: Clean up FIMD power on/off routines

This patch separates the fimd_activate function into poweron/poweroff
functions to be more consistent with the other drivers in exynos drm. It
also properly cleans up after failures in poweron. The functions have
also been shuffled around such that they are all in the same
spot in the file and poweron/poweroff can be called from the dpms function.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 32b2a90..040fecc 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -566,6 +566,12 @@ static void fimd_win_commit(struct exynos_drm_manager *mgr, int zpos)
 
        win_data = &ctx->win_data[win];
 
+       /* If suspended, enable this on resume */
+       if (ctx->suspended) {
+               win_data->resume = true;
+               return;
+       }
+
        /*
         * SHADOWCON/PRTCON register is used for enabling timing.
         *
@@ -707,6 +713,129 @@ static void fimd_win_disable(struct exynos_drm_manager *mgr, int zpos)
        win_data->enabled = false;
 }
 
+static void fimd_clear_win(struct fimd_context *ctx, int win)
+{
+       writel(0, ctx->regs + WINCON(win));
+       writel(0, ctx->regs + VIDOSD_A(win));
+       writel(0, ctx->regs + VIDOSD_B(win));
+       writel(0, ctx->regs + VIDOSD_C(win));
+
+       if (win == 1 || win == 2)
+               writel(0, ctx->regs + VIDOSD_D(win));
+
+       fimd_shadow_protect_win(ctx, win, false);
+}
+
+static void fimd_window_suspend(struct exynos_drm_manager *mgr)
+{
+       struct fimd_context *ctx = mgr->ctx;
+       struct fimd_win_data *win_data;
+       int i;
+
+       for (i = 0; i < WINDOWS_NR; i++) {
+               win_data = &ctx->win_data[i];
+               win_data->resume = win_data->enabled;
+               if (win_data->enabled)
+                       fimd_win_disable(mgr, i);
+       }
+       fimd_wait_for_vblank(mgr);
+}
+
+static void fimd_window_resume(struct exynos_drm_manager *mgr)
+{
+       struct fimd_context *ctx = mgr->ctx;
+       struct fimd_win_data *win_data;
+       int i;
+
+       for (i = 0; i < WINDOWS_NR; i++) {
+               win_data = &ctx->win_data[i];
+               win_data->enabled = win_data->resume;
+               win_data->resume = false;
+       }
+}
+
+static void fimd_apply(struct exynos_drm_manager *mgr)
+{
+       struct fimd_context *ctx = mgr->ctx;
+       struct fimd_win_data *win_data;
+       int i;
+
+       for (i = 0; i < WINDOWS_NR; i++) {
+               win_data = &ctx->win_data[i];
+               if (win_data->enabled)
+                       fimd_win_commit(mgr, i);
+       }
+
+       fimd_commit(mgr);
+}
+
+static int fimd_poweron(struct exynos_drm_manager *mgr)
+{
+       struct fimd_context *ctx = mgr->ctx;
+       int ret;
+
+       if (!ctx->suspended)
+               return 0;
+
+       ctx->suspended = false;
+
+       ret = clk_prepare_enable(ctx->bus_clk);
+       if (ret < 0) {
+               DRM_ERROR("Failed to prepare_enable the bus clk [%d]\n", ret);
+               goto bus_clk_err;
+       }
+
+       ret = clk_prepare_enable(ctx->lcd_clk);
+       if  (ret < 0) {
+               DRM_ERROR("Failed to prepare_enable the lcd clk [%d]\n", ret);
+               goto lcd_clk_err;
+       }
+
+       /* if vblank was enabled status, enable it again. */
+       if (test_and_clear_bit(0, &ctx->irq_flags)) {
+               ret = fimd_enable_vblank(mgr);
+               if (ret) {
+                       DRM_ERROR("Failed to re-enable vblank [%d]\n", ret);
+                       goto enable_vblank_err;
+               }
+       }
+
+       fimd_window_resume(mgr);
+
+       fimd_apply(mgr);
+
+       return 0;
+
+enable_vblank_err:
+       clk_disable_unprepare(ctx->lcd_clk);
+lcd_clk_err:
+       clk_disable_unprepare(ctx->bus_clk);
+bus_clk_err:
+       ctx->suspended = true;
+       return ret;
+}
+
+static int fimd_poweroff(struct exynos_drm_manager *mgr)
+{
+       struct fimd_context *ctx = mgr->ctx;
+
+       if (ctx->suspended)
+               return 0;
+
+       /*
+        * We need to make sure that all windows are disabled before we
+        * suspend that connector. Otherwise we might try to scan from
+        * a destroyed buffer later.
+        */
+       fimd_window_suspend(mgr);
+
+       clk_disable_unprepare(ctx->lcd_clk);
+       clk_disable_unprepare(ctx->bus_clk);
+
+       ctx->suspended = true;
+       return 0;
+}
+
 static void fimd_dpms(struct exynos_drm_manager *mgr, int mode)
 {
        struct fimd_context *ctx = mgr->ctx;
@@ -783,114 +912,6 @@ out:
        return IRQ_HANDLED;
 }
 
-
-static void fimd_clear_win(struct fimd_context *ctx, int win)
-{
-       writel(0, ctx->regs + WINCON(win));
-       writel(0, ctx->regs + VIDOSD_A(win));
-       writel(0, ctx->regs + VIDOSD_B(win));
-       writel(0, ctx->regs + VIDOSD_C(win));
-
-       if (win == 1 || win == 2)
-               writel(0, ctx->regs + VIDOSD_D(win));
-
-       fimd_shadow_protect_win(ctx, win, false);
-}
-
-static int fimd_clock(struct fimd_context *ctx, bool enable)
-{
-       if (enable) {
-               int ret;
-
-               ret = clk_prepare_enable(ctx->bus_clk);
-               if (ret < 0)
-                       return ret;
-
-               ret = clk_prepare_enable(ctx->lcd_clk);
-               if  (ret < 0) {
-                       clk_disable_unprepare(ctx->bus_clk);
-                       return ret;
-               }
-       } else {
-               clk_disable_unprepare(ctx->lcd_clk);
-               clk_disable_unprepare(ctx->bus_clk);
-       }
-
-       return 0;
-}
-
-static void fimd_window_suspend(struct exynos_drm_manager *mgr)
-{
-       struct fimd_context *ctx = mgr->ctx;
-       struct fimd_win_data *win_data;
-       int i;
-
-       for (i = 0; i < WINDOWS_NR; i++) {
-               win_data = &ctx->win_data[i];
-               win_data->resume = win_data->enabled;
-               fimd_win_disable(mgr, i);
-       }
-       fimd_wait_for_vblank(mgr);
-}
-
-static void fimd_window_resume(struct exynos_drm_manager *mgr)
-{
-       struct fimd_context *ctx = mgr->ctx;
-       struct fimd_win_data *win_data;
-       int i;
-
-       for (i = 0; i < WINDOWS_NR; i++) {
-               win_data = &ctx->win_data[i];
-               win_data->enabled = win_data->resume;
-               win_data->resume = false;
-       }
-}
-
-static void fimd_apply(struct exynos_drm_manager *mgr)
-{
-       struct fimd_context *ctx = mgr->ctx;
-       struct fimd_win_data *win_data;
-       int i;
-
-       for (i = 0; i < WINDOWS_NR; i++) {
-               win_data = &ctx->win_data[i];
-               if (win_data->enabled)
-                       fimd_win_commit(mgr, i);
-       }
-
-       fimd_commit(mgr);
-}
-
-static int fimd_activate(struct exynos_drm_manager *mgr, bool enable)
-{
-       struct fimd_context *ctx = mgr->ctx;
-
-       if (enable) {
-               int ret;
-
-               ret = fimd_clock(ctx, true);
-               if (ret < 0)
-                       return ret;
-
-               ctx->suspended = false;
-
-               /* if vblank was enabled status, enable it again. */
-               if (test_and_clear_bit(0, &ctx->irq_flags))
-                       fimd_enable_vblank(mgr);
-
-               fimd_window_resume(mgr);
-
-               fimd_apply(mgr);
-       } else {
-               fimd_window_suspend(mgr);
-
-               fimd_clock(ctx, false);
-               ctx->suspended = true;
-       }
-
-       return 0;
-}
-
 static int fimd_get_platform_data(struct fimd_context *ctx, struct device *dev)
 {
        struct videomode *vm;
@@ -932,6 +953,7 @@ static int fimd_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        ctx->dev = dev;
+       ctx->suspended = true;
 
        ret = fimd_get_platform_data(ctx, dev);
        if (ret)
@@ -1037,7 +1059,7 @@ static int fimd_suspend(struct device *dev)
         * because the usage_count of pm runtime is more than 1.
         */
        if (!pm_runtime_suspended(dev))
-               return fimd_activate(mgr, false);
+               return fimd_poweroff(mgr);
 
        return 0;
 }
@@ -1054,7 +1076,7 @@ static int fimd_resume(struct device *dev)
        if (pm_runtime_suspended(dev))
                return 0;
 
-       return fimd_activate(mgr, true);
+       return fimd_poweron(mgr);
 }
 #endif
 
@@ -1063,14 +1085,14 @@ static int fimd_runtime_suspend(struct device *dev)
 {
        struct exynos_drm_manager *mgr = get_fimd_manager(dev);
 
-       return fimd_activate(mgr, false);
+       return fimd_poweroff(mgr);
 }
 
 static int fimd_runtime_resume(struct device *dev)
 {
        struct exynos_drm_manager *mgr = get_fimd_manager(dev);
 
-       return fimd_activate(mgr, true);
+       return fimd_poweron(mgr);
 }
 #endif