diff options
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index df59407e6254..d248d6e64424 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c | |||
@@ -377,34 +377,8 @@ static int exynos_drm_sys_resume(struct device *dev) | |||
377 | } | 377 | } |
378 | #endif | 378 | #endif |
379 | 379 | ||
380 | #ifdef CONFIG_PM_RUNTIME | ||
381 | static int exynos_drm_runtime_suspend(struct device *dev) | ||
382 | { | ||
383 | struct drm_device *drm_dev = dev_get_drvdata(dev); | ||
384 | pm_message_t message; | ||
385 | |||
386 | if (pm_runtime_suspended(dev)) | ||
387 | return 0; | ||
388 | |||
389 | message.event = PM_EVENT_SUSPEND; | ||
390 | return exynos_drm_suspend(drm_dev, message); | ||
391 | } | ||
392 | |||
393 | static int exynos_drm_runtime_resume(struct device *dev) | ||
394 | { | ||
395 | struct drm_device *drm_dev = dev_get_drvdata(dev); | ||
396 | |||
397 | if (!pm_runtime_suspended(dev)) | ||
398 | return 0; | ||
399 | |||
400 | return exynos_drm_resume(drm_dev); | ||
401 | } | ||
402 | #endif | ||
403 | |||
404 | static const struct dev_pm_ops exynos_drm_pm_ops = { | 380 | static const struct dev_pm_ops exynos_drm_pm_ops = { |
405 | SET_SYSTEM_SLEEP_PM_OPS(exynos_drm_sys_suspend, exynos_drm_sys_resume) | 381 | SET_SYSTEM_SLEEP_PM_OPS(exynos_drm_sys_suspend, exynos_drm_sys_resume) |
406 | SET_RUNTIME_PM_OPS(exynos_drm_runtime_suspend, | ||
407 | exynos_drm_runtime_resume, NULL) | ||
408 | }; | 382 | }; |
409 | 383 | ||
410 | int exynos_drm_component_add(struct device *dev, | 384 | int exynos_drm_component_add(struct device *dev, |
@@ -487,9 +461,6 @@ static int exynos_drm_add_components(struct device *dev, struct master *m) | |||
487 | 461 | ||
488 | static int exynos_drm_bind(struct device *dev) | 462 | static int exynos_drm_bind(struct device *dev) |
489 | { | 463 | { |
490 | pm_runtime_enable(dev); | ||
491 | pm_runtime_get_sync(dev); | ||
492 | |||
493 | return drm_platform_init(&exynos_drm_driver, to_platform_device(dev)); | 464 | return drm_platform_init(&exynos_drm_driver, to_platform_device(dev)); |
494 | } | 465 | } |
495 | 466 | ||