drm/i915: fixup hangman rebase goof-up

[~andy/linux] / drivers / gpu / drm / i915 / i915_drv.c

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f0bd30ab15514a41babc24945425811244d2c9ab..e41aadef99378282a9bd49dbc9a1f4aee1277cb6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -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;