From 8335f4b4c029d8b94bf110237a0a4aaa7fe195a4 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 13 Oct 2010 10:09:14 +0100
Subject: [PATCH] --- yaml --- r: 218313 b: refs/heads/master c:
 e60a0b107b3df072e23cb6d68510aa2615b059ce h: refs/heads/master i:   218311:
 3c7bc5131115de0eacf746afbef6d38ca8d004f8 v: v3

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

diff --git a/[refs] b/[refs]
index 647a9e0a7bb2..a6b125395f9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b5337ddbaf7e4b71ef6fd6307c6f9ef84f636e9
+refs/heads/master: e60a0b107b3df072e23cb6d68510aa2615b059ce
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
index d89b88791aac..89004a622f49 100644
--- a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -707,7 +707,7 @@ int intel_wait_ring_buffer(struct drm_device *dev,
 				master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
 		}
 
-		yield();
+		msleep(1);
 	} while (!time_after(jiffies, end));
 	trace_i915_ring_wait_end (dev);
 	return -EBUSY;