xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next

Browse Source
This commit is contained in:
Dave Airlie
2011-01-05 08:31:08 +10:00
parent 204663c487 989d873fc5
commit 4f125010d2
656 changed files with 6383 additions and 4644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/radeon/radeon_device.c
View File

@@ -916,11 +916,6 @@ int radeon_resume_kms(struct drm_device *dev)
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();
@@ -928,6 +923,10 @@ int radeon_resume_kms(struct drm_device *dev)
radeon_hpd_init(rdev);
/* blat the mode back in */
drm_helper_resume_force_mode(dev);
/* turn on display hw */
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
}
return 0;
}