diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 256d204a6d24..ed5e153384ac 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
@@ -829,11 +829,6 @@ int radeon_resume_kms(struct drm_device *dev) | |||
829 | radeon_pm_resume(rdev); | 829 | radeon_pm_resume(rdev); |
830 | radeon_restore_bios_scratch_regs(rdev); | 830 | radeon_restore_bios_scratch_regs(rdev); |
831 | 831 | ||
832 | /* turn on display hw */ | ||
833 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | ||
834 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); | ||
835 | } | ||
836 | |||
837 | radeon_fbdev_set_suspend(rdev, 0); | 832 | radeon_fbdev_set_suspend(rdev, 0); |
838 | release_console_sem(); | 833 | release_console_sem(); |
839 | 834 | ||
@@ -841,6 +836,10 @@ int radeon_resume_kms(struct drm_device *dev) | |||
841 | radeon_hpd_init(rdev); | 836 | radeon_hpd_init(rdev); |
842 | /* blat the mode back in */ | 837 | /* blat the mode back in */ |
843 | drm_helper_resume_force_mode(dev); | 838 | drm_helper_resume_force_mode(dev); |
839 | /* turn on display hw */ | ||
840 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | ||
841 | drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); | ||
842 | } | ||
844 | return 0; | 843 | return 0; |
845 | } | 844 | } |
846 | 845 | ||