From d8669b9083c9898e4adf8824a632c9c5a8e9c217 Mon Sep 17 00:00:00 2001 From: Cedric Godin Date: Fri, 11 Jun 2010 14:40:56 -0400 Subject: [PATCH] --- yaml --- r: 200715 b: refs/heads/master c: 09bdf591f4724c7d0328d4d7b8808492addb5a28 h: refs/heads/master i: 200713: 2fda6bbdf6d3e34948fc22a65712f900109ea9d6 200711: c0255b17cc6d6b1d1176a686a69c1877303a527c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7360058f0d1d..8af0f1bc7c7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0888e883ea5ff8fac27e813256d6c1eaede5a234 +refs/heads/master: 09bdf591f4724c7d0328d4d7b8808492addb5a28 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c index f10faed21567..5f317317aba2 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_device.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_device.c @@ -779,6 +779,7 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state) int radeon_resume_kms(struct drm_device *dev) { + struct drm_connector *connector; struct radeon_device *rdev = dev->dev_private; if (rdev->powered_down) @@ -797,6 +798,12 @@ int radeon_resume_kms(struct drm_device *dev) radeon_resume(rdev); radeon_pm_resume(rdev); radeon_restore_bios_scratch_regs(rdev); + + /* turn on display hw */ + list_for_each_entry(connector, &dev->mode_config.connector_list, head) { + drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); + } + radeon_fbdev_set_suspend(rdev, 0); release_console_sem();