drm/exynos: Implement dpms display callback in DP

This patch implements the dpms display callback for the DP driver.

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_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c
index 5c261616c06f4b44981b16c0a597034df45114d9..05ce947e3347ce84ecfbfc35ec442895acccfe01 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_dp_core.c
+++ b/drivers/gpu/drm/exynos/exynos_dp_core.c
@@ -915,10 +915,78 @@ static int exynos_dp_check_mode(struct exynos_drm_display *display,
        return 0;
 }
 
+static void exynos_dp_phy_init(struct exynos_dp_device *dp)
+{
+       if (dp->phy) {
+               phy_power_on(dp->phy);
+       } else if (dp->phy_addr) {
+               u32 reg;
+
+               reg = __raw_readl(dp->phy_addr);
+               reg |= dp->enable_mask;
+               __raw_writel(reg, dp->phy_addr);
+       }
+}
+
+static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
+{
+       if (dp->phy) {
+               phy_power_off(dp->phy);
+       } else if (dp->phy_addr) {
+               u32 reg;
+
+               reg = __raw_readl(dp->phy_addr);
+               reg &= ~(dp->enable_mask);
+               __raw_writel(reg, dp->phy_addr);
+       }
+}
+
+static void exynos_dp_poweron(struct exynos_dp_device *dp)
+{
+       if (dp->dpms_mode == DRM_MODE_DPMS_ON)
+               return;
+
+       clk_prepare_enable(dp->clock);
+       exynos_dp_phy_init(dp);
+       exynos_dp_init_dp(dp);
+       enable_irq(dp->irq);
+}
+
+static void exynos_dp_poweroff(struct exynos_dp_device *dp)
+{
+       if (dp->dpms_mode != DRM_MODE_DPMS_ON)
+               return;
+
+       disable_irq(dp->irq);
+       flush_work(&dp->hotplug_work);
+       exynos_dp_phy_exit(dp);
+       clk_disable_unprepare(dp->clock);
+}
+
+static void exynos_dp_dpms(struct exynos_drm_display *display, int mode)
+{
+       struct exynos_dp_device *dp = display->ctx;
+
+       switch (mode) {
+       case DRM_MODE_DPMS_ON:
+               exynos_dp_poweron(dp);
+               break;
+       case DRM_MODE_DPMS_STANDBY:
+       case DRM_MODE_DPMS_SUSPEND:
+       case DRM_MODE_DPMS_OFF:
+               exynos_dp_poweroff(dp);
+               break;
+       default:
+               break;
+       };
+       dp->dpms_mode = mode;
+}
+
 static struct exynos_drm_display_ops exynos_dp_display_ops = {
        .is_connected = exynos_dp_display_is_connected,
        .get_panel = exynos_dp_get_panel,
        .check_mode = exynos_dp_check_mode,
+       .dpms = exynos_dp_dpms,
 };
 
 static struct exynos_drm_display exynos_dp_display = {
@@ -1040,54 +1108,6 @@ static int exynos_dp_dt_parse_panel(struct exynos_dp_device *dp)
        return 0;
 }
 
-static void exynos_dp_phy_init(struct exynos_dp_device *dp)
-{
-       if (dp->phy) {
-               phy_power_on(dp->phy);
-       } else if (dp->phy_addr) {
-               u32 reg;
-
-               reg = __raw_readl(dp->phy_addr);
-               reg |= dp->enable_mask;
-               __raw_writel(reg, dp->phy_addr);
-       }
-}
-
-static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
-{
-       if (dp->phy) {
-               phy_power_off(dp->phy);
-       } else if (dp->phy_addr) {
-               u32 reg;
-
-               reg = __raw_readl(dp->phy_addr);
-               reg &= ~(dp->enable_mask);
-               __raw_writel(reg, dp->phy_addr);
-       }
-}
-
-void exynos_dp_poweron(struct exynos_dp_device *dp)
-{
-       exynos_dp_phy_init(dp);
-
-       clk_prepare_enable(dp->clock);
-
-       exynos_dp_init_dp(dp);
-
-       enable_irq(dp->irq);
-}
-
-void exynos_dp_poweroff(struct exynos_dp_device *dp)
-{
-       disable_irq(dp->irq);
-
-       flush_work(&dp->hotplug_work);
-
-       exynos_dp_phy_exit(dp);
-
-       clk_disable_unprepare(dp->clock);
-}
-
 static int exynos_dp_probe(struct platform_device *pdev)
 {
        struct resource *res;
@@ -1103,6 +1123,7 @@ static int exynos_dp_probe(struct platform_device *pdev)
        }
 
        dp->dev = &pdev->dev;
+       dp->dpms_mode = DRM_MODE_DPMS_OFF;
 
        dp->video_info = exynos_dp_dt_parse_pdata(&pdev->dev);
        if (IS_ERR(dp->video_info))
@@ -1148,10 +1169,11 @@ static int exynos_dp_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "failed to request irq\n");
                return ret;
        }
-
-       platform_set_drvdata(pdev, dp);
+       disable_irq(dp->irq);
 
        exynos_dp_display.ctx = dp;
+
+       platform_set_drvdata(pdev, &exynos_dp_display);
        exynos_drm_display_register(&exynos_dp_display);
 
        return 0;
@@ -1159,34 +1181,30 @@ static int exynos_dp_probe(struct platform_device *pdev)
 
 static int exynos_dp_remove(struct platform_device *pdev)
 {
-       struct exynos_dp_device *dp = platform_get_drvdata(pdev);
+       struct exynos_drm_display *display = platform_get_drvdata(pdev);
 
+       exynos_dp_dpms(display, DRM_MODE_DPMS_OFF);
        exynos_drm_display_unregister(&exynos_dp_display);
 
-       flush_work(&dp->hotplug_work);
-
-       exynos_dp_phy_exit(dp);
-
-       clk_disable_unprepare(dp->clock);
-
-
        return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
 static int exynos_dp_suspend(struct device *dev)
 {
-       struct exynos_dp_device *dp = dev_get_drvdata(dev);
+       struct platform_device *pdev = to_platform_device(dev);
+       struct exynos_drm_display *display = platform_get_drvdata(pdev);
 
-       exynos_dp_poweroff(dp);
+       exynos_dp_dpms(display, DRM_MODE_DPMS_OFF);
        return 0;
 }
 
 static int exynos_dp_resume(struct device *dev)
 {
-       struct exynos_dp_device *dp = dev_get_drvdata(dev);
+       struct platform_device *pdev = to_platform_device(dev);
+       struct exynos_drm_display *display = platform_get_drvdata(pdev);
 
-       exynos_dp_poweron(dp);
+       exynos_dp_dpms(display, DRM_MODE_DPMS_ON);
        return 0;
 }
 #endif

diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.h b/drivers/gpu/drm/exynos/exynos_dp_core.h
index 4f1414162bbe8751c039be470f0f42047c3931af..ccaeadc8ee16fc3dec91972d395e1fea8b3836a1 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_dp_core.h
+++ b/drivers/gpu/drm/exynos/exynos_dp_core.h
@@ -154,6 +154,7 @@ struct exynos_dp_device {
        struct link_train       link_train;
        struct work_struct      hotplug_work;
        struct phy              *phy;
+       int                     dpms_mode;
 
        struct exynos_drm_panel_info panel;
 };