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

drm: Merge tag 'v3.3-rc7' into drm-core-next

Browse Source 
Merge the fixes so far into core-next, needed to test
intel driver.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
This commit is contained in:
Dave Airlie
2012-03-15 10:24:32 +00:00
parent c3c50e8b65 fde7d9049e
commit 8229c885fe
1162 changed files with 9080 additions and 47082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/radeon/rs690.c
View File

@@ -659,6 +659,8 @@ static int rs690_startup(struct radeon_device *rdev)
int rs690_resume(struct radeon_device *rdev)
{
int r;
/* Make sur GART are not working */
rs400_gart_disable(rdev);
/* Resume clock before doing reset */
@@ -677,7 +679,11 @@ int rs690_resume(struct radeon_device *rdev)
radeon_surface_init(rdev);
rdev->accel_working = true;
return rs690_startup(rdev);
r = rs690_startup(rdev);
if (r) {
rdev->accel_working = false;
}
return r;
}
int rs690_suspend(struct radeon_device *rdev)