Commit e080b915 authored by Daniel Vetter's avatar Daniel Vetter

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 20848223
...@@ -860,8 +860,6 @@ int i915_reset(struct drm_device *dev) ...@@ -860,8 +860,6 @@ int i915_reset(struct drm_device *dev)
if (!mutex_trylock(&dev->struct_mutex)) if (!mutex_trylock(&dev->struct_mutex))
return -EBUSY; return -EBUSY;
dev_priv->stop_rings = 0;
i915_gem_reset(dev); i915_gem_reset(dev);
ret = -ENODEV; ret = -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment