---

yaml --- r: 318599 b: refs/heads/master c: e080b91 h: refs/heads/master i: 318597: 7074902 318595: ab7d384 318591: d85e516 v: v3
git-mirror · Jun 18, 2012 · dec65da · dec65da
1 parent b01af65
commit dec65da
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;