From dec65da3eb66998ea9e9ae50d5540043483e6edf Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sat, 16 Jun 2012 18:29:44 +0200
Subject: [PATCH] --- yaml --- r: 318599 b: refs/heads/master c:
 e080b915ecea3fff3e0d8d380a221677add419a5 h: refs/heads/master i:   318597:
 70749026982f3c3ca68ec8f328d5cc5a839da357   318595:
 ab7d3847f497164d2f1da471027cdc884feece9b   318591:
 d85e516b7629620eb5971c266bc8e290c7cedd2c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 49d3dca3eecc..efcf46633371 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 208482232de3590cee4757dfabe5d8cee8c6e626
+refs/heads/master: e080b915ecea3fff3e0d8d380a221677add419a5
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index f0bd30ab1551..e41aadef9937 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/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;