tree e02f06a6968bd5baf73a94ec5141a71935dc9cae
parent acdb37c361dc87e165889a504e291c1e82ae133c
parent 19b2dbde5732170a03bd82cc8bd442cf88d856f7
author Dave Airlie <airlied@redhat.com> 1372120724 +1000
committer Dave Airlie <airlied@redhat.com> 1372120724 +1000

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