[Intel-gfx] [PATCH] drm/i915: fixup hangman rebase goof-up

[Daniel Vetter]

On Sat, Jun 16, 2012 at 06:29:44PM +0200, Daniel Vetter wrote:
> I've added a bit of logic such that running the hangman test on chips
> without any hw reset support at all doesn't wedge the gpu because the
> reset failed. This relied on checking for non-null stop_rings.
> Unfortunately I've botched a rebase somewhere and stop_rings is still
> cleared at the old place before the reset code.
> 
> Fix this up so that running the i-g-t tests on gen2/3 doesn't result
> in a wedged gpu.
> 
> v2: Actually remove the lines instead of adding them twice ... my git
> license should be revoked immediately.
> 
> Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
I've queued this one for -next.
-Daniel
-- 
Daniel Vetter
Mail: daniel at ffwll.ch
Mobile: +41 (0)79 365 57 48