]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: fixup hangman rebase goof-up
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Sat, 16 Jun 2012 16:29:44 +0000 (18:29 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 18 Jun 2012 08:43:54 +0000 (10:43 +0200)
commite201ce8dbbf923b512a142ebcba5b029d226b8ee
tree0410b73ccf9cc25a9efe2d97d4930783618e888d
parent033c773b768651d2ce0360f8318845efef5bc582
drm/i915: fixup hangman rebase goof-up

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@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c