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

Daniel Vetter
2012-06-16T14:40:56Z

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.

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/i915_drv.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index e41aade..f0bd30a 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -860,6 +860,8 @@ int i915_reset(struct drm_device *dev)
if (!mutex_trylock(&dev->struct_mutex))
return -EBUSY;

+ dev_priv->stop_rings = 0;
+
i915_gem_reset(dev);

ret = -ENODEV;
--
1.7.10