From cd1129022f161d07acc9710ba5c86154b666c471 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 4 Aug 2010 15:18:12 +0100
Subject: [PATCH] --- yaml --- r: 209725 b: refs/heads/master c:
 1741dd4aa7552055659bf74ab829a21579407f10 h: refs/heads/master i:   209723:
 b77a73e642358992fba697d759e35cc63d592007 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/i915/intel_ringbuffer.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 87555c868956..bb326ce4ea4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae7d49d879fd196bded306e9465e0aa5a203e971
+refs/heads/master: 1741dd4aa7552055659bf74ab829a21579407f10
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
index 26362f8495a8..df8302a11eb5 100644
--- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -682,9 +682,11 @@ int intel_wrap_ring_buffer(struct drm_device *dev,
 	}
 
 	virt = (unsigned int *)(ring->virtual_start + ring->tail);
-	rem /= 4;
-	while (rem--)
+	rem /= 8;
+	while (rem--) {
 		*virt++ = MI_NOOP;
+		*virt++ = MI_NOOP;
+	}
 
 	ring->tail = 0;
 	ring->space = ring->head - 8;