|
@@ -304,45 +304,6 @@ int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_PM_SLEEP
|
|
|
|
-static int exynos_drm_suspend(struct drm_device *dev, pm_message_t state)
|
|
|
|
-{
|
|
|
|
- struct drm_connector *connector;
|
|
|
|
-
|
|
|
|
- drm_modeset_lock_all(dev);
|
|
|
|
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
- int old_dpms = connector->dpms;
|
|
|
|
-
|
|
|
|
- if (connector->funcs->dpms)
|
|
|
|
- connector->funcs->dpms(connector, DRM_MODE_DPMS_OFF);
|
|
|
|
-
|
|
|
|
- /* Set the old mode back to the connector for resume */
|
|
|
|
- connector->dpms = old_dpms;
|
|
|
|
- }
|
|
|
|
- drm_modeset_unlock_all(dev);
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-static int exynos_drm_resume(struct drm_device *dev)
|
|
|
|
-{
|
|
|
|
- struct drm_connector *connector;
|
|
|
|
-
|
|
|
|
- drm_modeset_lock_all(dev);
|
|
|
|
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
- if (connector->funcs->dpms) {
|
|
|
|
- int dpms = connector->dpms;
|
|
|
|
-
|
|
|
|
- connector->dpms = DRM_MODE_DPMS_OFF;
|
|
|
|
- connector->funcs->dpms(connector, dpms);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- drm_modeset_unlock_all(dev);
|
|
|
|
-
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
|
|
static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
|
|
{
|
|
{
|
|
struct drm_exynos_file_private *file_priv;
|
|
struct drm_exynos_file_private *file_priv;
|
|
@@ -476,31 +437,54 @@ static struct drm_driver exynos_drm_driver = {
|
|
};
|
|
};
|
|
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
#ifdef CONFIG_PM_SLEEP
|
|
-static int exynos_drm_sys_suspend(struct device *dev)
|
|
|
|
|
|
+static int exynos_drm_suspend(struct device *dev)
|
|
{
|
|
{
|
|
struct drm_device *drm_dev = dev_get_drvdata(dev);
|
|
struct drm_device *drm_dev = dev_get_drvdata(dev);
|
|
- pm_message_t message;
|
|
|
|
|
|
+ struct drm_connector *connector;
|
|
|
|
|
|
if (pm_runtime_suspended(dev) || !drm_dev)
|
|
if (pm_runtime_suspended(dev) || !drm_dev)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- message.event = PM_EVENT_SUSPEND;
|
|
|
|
- return exynos_drm_suspend(drm_dev, message);
|
|
|
|
|
|
+ drm_modeset_lock_all(drm_dev);
|
|
|
|
+ drm_for_each_connector(connector, drm_dev) {
|
|
|
|
+ int old_dpms = connector->dpms;
|
|
|
|
+
|
|
|
|
+ if (connector->funcs->dpms)
|
|
|
|
+ connector->funcs->dpms(connector, DRM_MODE_DPMS_OFF);
|
|
|
|
+
|
|
|
|
+ /* Set the old mode back to the connector for resume */
|
|
|
|
+ connector->dpms = old_dpms;
|
|
|
|
+ }
|
|
|
|
+ drm_modeset_unlock_all(drm_dev);
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static int exynos_drm_sys_resume(struct device *dev)
|
|
|
|
|
|
+static int exynos_drm_resume(struct device *dev)
|
|
{
|
|
{
|
|
struct drm_device *drm_dev = dev_get_drvdata(dev);
|
|
struct drm_device *drm_dev = dev_get_drvdata(dev);
|
|
|
|
+ struct drm_connector *connector;
|
|
|
|
|
|
if (pm_runtime_suspended(dev) || !drm_dev)
|
|
if (pm_runtime_suspended(dev) || !drm_dev)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- return exynos_drm_resume(drm_dev);
|
|
|
|
|
|
+ drm_modeset_lock_all(drm_dev);
|
|
|
|
+ drm_for_each_connector(connector, drm_dev) {
|
|
|
|
+ if (connector->funcs->dpms) {
|
|
|
|
+ int dpms = connector->dpms;
|
|
|
|
+
|
|
|
|
+ connector->dpms = DRM_MODE_DPMS_OFF;
|
|
|
|
+ connector->funcs->dpms(connector, dpms);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ drm_modeset_unlock_all(drm_dev);
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
static const struct dev_pm_ops exynos_drm_pm_ops = {
|
|
static const struct dev_pm_ops exynos_drm_pm_ops = {
|
|
- SET_SYSTEM_SLEEP_PM_OPS(exynos_drm_sys_suspend, exynos_drm_sys_resume)
|
|
|
|
|
|
+ SET_SYSTEM_SLEEP_PM_OPS(exynos_drm_suspend, exynos_drm_resume)
|
|
};
|
|
};
|
|
|
|
|
|
/* forward declaration */
|
|
/* forward declaration */
|