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

Merge tag 'v3.14-rc7' into drm-next

Browse Source 
Linux 3.14-rc7

Backmerge to help out Intel guys.
This commit is contained in:
Dave Airlie
2014-03-18 19:12:31 +10:00
parent 978c605016 dcb99fd9b0
commit bcc298bc92
589 changed files with 5738 additions and 3888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/radeon/r600.c
View File

@@ -2964,7 +2964,8 @@ int r600_resume(struct radeon_device *rdev)
/* post card */
atom_asic_init(rdev->mode_info.atom_context);
radeon_pm_resume(rdev);
if (rdev->pm.pm_method == PM_METHOD_DPM)
radeon_pm_resume(rdev);
rdev->accel_working = true;
r = r600_startup(rdev);