diff options
author | Dave Airlie | 2012-03-15 11:24:32 +0100 |
---|---|---|
committer | Dave Airlie | 2012-03-15 11:24:32 +0100 |
commit | 8229c885fe361e521ac64de36b16011e54a30de0 (patch) | |
tree | 572e5d34b16713ddef9e803308c6f72014aff01b /drivers/gpu/drm/radeon/ni.c | |
parent | drm: Add drm_mode_copy() (diff) | |
parent | Linux 3.3-rc7 (diff) | |
download | kernel-qcow2-linux-8229c885fe361e521ac64de36b16011e54a30de0.tar.gz kernel-qcow2-linux-8229c885fe361e521ac64de36b16011e54a30de0.tar.xz kernel-qcow2-linux-8229c885fe361e521ac64de36b16011e54a30de0.zip |
drm: Merge tag 'v3.3-rc7' into drm-core-next
Merge the fixes so far into core-next, needed to test
intel driver.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/gpu/drm/radeon/ni.c')
-rw-r--r-- | drivers/gpu/drm/radeon/ni.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 8ce7f9973a5c..160799c14b91 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -1547,6 +1547,7 @@ int cayman_resume(struct radeon_device *rdev) r = cayman_startup(rdev); if (r) { DRM_ERROR("cayman startup failed on resume\n"); + rdev->accel_working = false; return r; } return r; |