From a903eed8188db015864da8d745d0765f0ed01257 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 18 Nov 2010 09:31:13 +0800
Subject: [PATCH] --- yaml --- r: 228721 b: refs/heads/master c:
 75a6898ffd20a13aba8d03f005eb4ab940134fcb h: refs/heads/master i:   228719:
 2a7cfd37cd57e9fb8eb3b0ff9a9cbcdaa1530678 v: v3

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

diff --git a/[refs] b/[refs]
index 854a57dbda4f..5fc662482fbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df9c2042858e85ab46731c13e708a5b0799db848
+refs/heads/master: 75a6898ffd20a13aba8d03f005eb4ab940134fcb
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index f0e6bd06fc0e..99b574050fde 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -472,9 +472,14 @@ int i915_reset(struct drm_device *dev, u8 flags)
 	 */
 	if (drm_core_check_feature(dev, DRIVER_MODESET) ||
 			!dev_priv->mm.suspended) {
-		struct intel_ring_buffer *ring = &dev_priv->render_ring;
 		dev_priv->mm.suspended = 0;
-		ring->init(ring);
+
+		dev_priv->render_ring.init(&dev_priv->render_ring);
+		if (HAS_BSD(dev))
+		    dev_priv->bsd_ring.init(&dev_priv->bsd_ring);
+		if (HAS_BLT(dev))
+		    dev_priv->blt_ring.init(&dev_priv->blt_ring);
+
 		mutex_unlock(&dev->struct_mutex);
 		drm_irq_uninstall(dev);
 		drm_irq_install(dev);