---

yaml --- r: 218313 b: refs/heads/master c: e60a0b1 h: refs/heads/master i: 218311: 3c7bc51 v: v3
git-mirror · Oct 19, 2010 · 8335f4b · 8335f4b
1 parent 5d918da
commit 8335f4b
Show file tree

Hide file tree

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