summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorInki Dae <inki.dae@samsung.com>2014-10-15 16:08:41 +0900
committerChanho Park <chanho61.park@samsung.com>2014-11-18 12:01:00 +0900
commitf32e9a4d3a0aa99968ea4bbecc54caa31ab8012e (patch)
tree8db5149d8ae569a513208707fb9d3ee18cb9083a /drivers/gpu
parent1470b337691932a926140ba90537fb8efd03aec0 (diff)
downloadlinux-3.10-f32e9a4d3a0aa99968ea4bbecc54caa31ab8012e.tar.gz
linux-3.10-f32e9a4d3a0aa99968ea4bbecc54caa31ab8012e.tar.bz2
linux-3.10-f32e9a4d3a0aa99968ea4bbecc54caa31ab8012e.zip
drm/exynos: correct connector->dpms field before resuming
During system suspend after connector switch off its dpms field is set to connector previous dpms state. To properly resume dpms field should be set to its actual state (off) before resuming to previous dpms state. Change-Id: I80acefcd408279c3c1cf3b0e89133dc6899a6914 Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_drv.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index d988d6542d5..9f29ae893e7 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -181,8 +181,12 @@ static int exynos_drm_resume(struct drm_device *dev)
drm_modeset_lock_all(dev);
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
- if (connector->funcs->dpms)
- connector->funcs->dpms(connector, connector->dpms);
+ if (connector->funcs->dpms) {
+ int dpms = connector->dpms;
+
+ connector->dpms = DRM_MODE_DPMS_OFF;
+ connector->funcs->dpms(connector, dpms);
+ }
}
drm_helper_resume_force_mode(dev);