drm/omap: Use atomic suspend/resume helpers

Instead of rolling out custom suspend/resume implementations based on
state information stored in the driver's data structures, use the atomic
suspend/resume helpers that rely on a DRM atomic state object.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 3b4bf5c47173ca6e98e3bd135b2404d2881c8b03..7b2f2c8bf89315916f162a3b5263f19542c8bcb9 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -432,9 +432,6 @@ struct omap_dss_device {
        unsigned long ops_flags;
        u32 bus_flags;
 
-       /* helper variable for driver suspend/resume */
-       bool activate_after_resume;
-
        enum omap_display_caps caps;
 
        enum omap_dss_display_state state;

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index f8292278f57dd24d05783b1659fb047657a43b11..bddd4c1c43ae39ce8580d0823dcb0edd36d99115 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -685,54 +685,12 @@ static int pdev_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
-static int omap_drm_suspend_all_displays(struct drm_device *ddev)
-{
-       struct omap_drm_private *priv = ddev->dev_private;
-       int i;
-
-       for (i = 0; i < priv->num_pipes; i++) {
-               struct omap_dss_device *display = priv->pipes[i].display;
-
-               if (display->state == OMAP_DSS_DISPLAY_ACTIVE) {
-                       display->ops->disable(display);
-                       display->activate_after_resume = true;
-               } else {
-                       display->activate_after_resume = false;
-               }
-       }
-
-       return 0;
-}
-
-static int omap_drm_resume_all_displays(struct drm_device *ddev)
-{
-       struct omap_drm_private *priv = ddev->dev_private;
-       int i;
-
-       for (i = 0; i < priv->num_pipes; i++) {
-               struct omap_dss_device *display = priv->pipes[i].display;
-
-               if (display->activate_after_resume) {
-                       display->ops->enable(display);
-                       display->activate_after_resume = false;
-               }
-       }
-
-       return 0;
-}
-
 static int omap_drm_suspend(struct device *dev)
 {
        struct omap_drm_private *priv = dev_get_drvdata(dev);
        struct drm_device *drm_dev = priv->ddev;
 
-       drm_kms_helper_poll_disable(drm_dev);
-
-       drm_modeset_lock_all(drm_dev);
-       omap_drm_suspend_all_displays(drm_dev);
-       drm_modeset_unlock_all(drm_dev);
-
-       return 0;
+       return drm_mode_config_helper_suspend(drm_dev);
 }
 
 static int omap_drm_resume(struct device *dev)
@@ -740,11 +698,7 @@ static int omap_drm_resume(struct device *dev)
        struct omap_drm_private *priv = dev_get_drvdata(dev);
        struct drm_device *drm_dev = priv->ddev;
 
-       drm_modeset_lock_all(drm_dev);
-       omap_drm_resume_all_displays(drm_dev);
-       drm_modeset_unlock_all(drm_dev);
-
-       drm_kms_helper_poll_enable(drm_dev);
+       drm_mode_config_helper_resume(drm_dev);
 
        return omap_gem_resume(drm_dev);
 }