From: Dave Airlie Date: Tue, 25 Jun 2013 00:38:44 +0000 (+1000) Subject: Merge tag 'drm-intel-fixes-2013-06-24' of git://people.freedesktop.org/~danvet/drm... X-Git-Tag: v3.12-rc1~573^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d20299dbb47b1ee429140ae0784b49231dc7781;p=kernel%2Fkernel-generic.git 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 --- 0d20299dbb47b1ee429140ae0784b49231dc7781