This patch implements the dpms display callback for the DP driver.
Signed-off-by: Sean Paul seanpaul@chromium.org ---
Changes in v2: - Added to the patchset
drivers/gpu/drm/exynos/exynos_dp_core.c | 173 ++++++++++++++++---------------- drivers/gpu/drm/exynos/exynos_dp_core.h | 1 + 2 files changed, 85 insertions(+), 89 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c index 13ea8b7..476d3b0 100644 --- a/drivers/gpu/drm/exynos/exynos_dp_core.c +++ b/drivers/gpu/drm/exynos/exynos_dp_core.c @@ -914,10 +914,82 @@ static int exynos_dp_check_mode(struct exynos_drm_display *display, return 0; }
+static void exynos_dp_phy_init(struct exynos_dp_device *dp) +{ + struct exynos_dp_platdata *pdata = dp->dev->platform_data; + u32 reg; + + if (dp->phy_addr) { + reg = readl(dp->phy_addr); + reg |= dp->enable_mask; + writel(reg, dp->phy_addr); + } + + if (pdata && pdata->phy_init) + pdata->phy_init(); +} + +static void exynos_dp_phy_exit(struct exynos_dp_device *dp) +{ + struct exynos_dp_platdata *pdata = dp->dev->platform_data; + u32 reg; + + if (dp->phy_addr) { + reg = readl(dp->phy_addr); + reg &= ~(dp->enable_mask); + writel(reg, dp->phy_addr); + } + + if (pdata && pdata->phy_exit) + pdata->phy_exit(); +} + +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 = { @@ -1044,24 +1116,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) -{ - 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) -{ - u32 reg; - - reg = __raw_readl(dp->phy_addr); - reg &= ~(dp->enable_mask); - __raw_writel(reg, dp->phy_addr); -} #else static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev) { @@ -1089,46 +1143,6 @@ static void exynos_dp_phy_exit(struct exynos_dp_device *dp) } #endif /* CONFIG_OF */
-void exynos_dp_poweron(struct exynos_dp_device *dp) -{ - struct device *dev = dp->dev; - struct exynos_dp_platdata *pdata = dev->platform_data; - - if (dev->of_node) { - if (dp->phy_addr) - exynos_dp_phy_init(dp); - } else { - if (pdata->phy_init) - pdata->phy_init(); - } - - clk_prepare_enable(dp->clock); - - exynos_dp_init_dp(dp); - - enable_irq(dp->irq); -} - -void exynos_dp_poweroff(struct exynos_dp_device *dp) -{ - struct device *dev = dp->dev; - struct exynos_dp_platdata *pdata = dev->platform_data; - - disable_irq(dp->irq); - - flush_work(&dp->hotplug_work); - - if (dev->of_node) { - if (dp->phy_addr) - exynos_dp_phy_exit(dp); - } else { - if (pdata->phy_exit) - pdata->phy_exit(); - } - - clk_disable_unprepare(dp->clock); -} - static int exynos_dp_probe(struct platform_device *pdev) { struct resource *res; @@ -1145,6 +1159,7 @@ static int exynos_dp_probe(struct platform_device *pdev) }
dp->dev = &pdev->dev; + dp->dpms_mode = DRM_MODE_DPMS_OFF;
if (pdev->dev.of_node) { pdata = exynos_dp_dt_parse_pdata(&pdev->dev); @@ -1190,26 +1205,17 @@ static int exynos_dp_probe(struct platform_device *pdev)
dp->video_info = pdata->video_info;
- if (pdev->dev.of_node) { - if (dp->phy_addr) - exynos_dp_phy_init(dp); - } else { - if (pdata->phy_init) - pdata->phy_init(); - } - - exynos_dp_init_dp(dp); - ret = devm_request_irq(&pdev->dev, dp->irq, exynos_dp_irq_handler, 0, "exynos-dp", dp); if (ret) { 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; @@ -1217,41 +1223,30 @@ static int exynos_dp_probe(struct platform_device *pdev)
static int exynos_dp_remove(struct platform_device *pdev) { - struct exynos_dp_platdata *pdata = pdev->dev.platform_data; - 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); - - if (pdev->dev.of_node) { - if (dp->phy_addr) - exynos_dp_phy_exit(dp); - } else { - if (pdata->phy_exit) - pdata->phy_exit(); - } - - 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 a5e9145..0c67c19 100644 --- a/drivers/gpu/drm/exynos/exynos_dp_core.h +++ b/drivers/gpu/drm/exynos/exynos_dp_core.h @@ -45,6 +45,7 @@ struct exynos_dp_device { struct video_info *video_info; struct link_train link_train; struct work_struct hotplug_work; + int dpms_mode;
struct exynos_drm_panel_info panel; };