Skip to content

Commit

Permalink
drm/i915: fixup hangman rebase goof-up
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Vetter committed Jun 18, 2012
1 parent 2084822 commit e080b91
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/gpu/drm/i915/i915_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -860,8 +860,6 @@ 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;
Expand Down

0 comments on commit e080b91

Please sign in to comment.