diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-06-25 10:38:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-25 10:38:44 +1000 |
| commit | 0d20299dbb47b1ee429140ae0784b49231dc7781 (patch) | |
| tree | e02f06a6968bd5baf73a94ec5141a71935dc9cae /drivers/gpu/drm/i915/i915_suspend.c | |
| parent | acdb37c361dc87e165889a504e291c1e82ae133c (diff) | |
| parent | 19b2dbde5732170a03bd82cc8bd442cf88d856f7 (diff) | |
Merge tag 'drm-intel-fixes-2013-06-24' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
One remaining regression fix for i915. I've left it in -fixes for more
than a week since it's in tricky code, and it took us a few kernel
releases to notice the regression at all. The fence leak is especially
annoying on gen2/3 and will kill userspace there quickly. For extra
paranoia we've added a WARN in -next to catch this, things seem to be
solid now.
* tag 'drm-intel-fixes-2013-06-24' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: Restore fences after resume and GPU resets
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 41f0fdecfbdc..369b3d8776ab 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -384,6 +384,7 @@ int i915_restore_state(struct drm_device *dev) mutex_lock(&dev->struct_mutex); + i915_gem_restore_fences(dev); i915_restore_display(dev); if (!drm_core_check_feature(dev, DRIVER_MODESET)) { |