From 3aefbd503e455ec9d4466c8217214fa32e613ef6 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 6 Dec 2010 14:36:02 +0000
Subject: [PATCH] --- yaml --- r: 228791 b: refs/heads/master c:
 0ac74c6b3386f0413baf48f6d61850650e0dc4ab h: refs/heads/master i:   228789:
 ea8144f2da2c75f7ed1dbe3acb75db3793ddfa56   228787:
 f66273f61ac21a2c74a5b58f7ac9d29bf2216aa6   228783:
 119f6cea654daa21e872edc0df2df30ac0dbcec9 v: v3

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

diff --git a/[refs] b/[refs]
index 353accecf91c..284e21d9eb20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bda10d152735c22baf1dcd92937420b4b0a359a
+refs/heads/master: 0ac74c6b3386f0413baf48f6d61850650e0dc4ab
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 8685b9279029..e7733333767d 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2154,8 +2154,9 @@ static int i915_ring_idle(struct drm_device *dev,
 	if (list_empty(&ring->gpu_write_list) && list_empty(&ring->active_list))
 		return 0;
 
-	i915_gem_flush_ring(dev, ring,
-			    I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS);
+	if (!list_empty(&ring->gpu_write_list))
+		i915_gem_flush_ring(dev, ring,
+				    I915_GEM_GPU_DOMAINS, I915_GEM_GPU_DOMAINS);
 	return i915_wait_request(dev,
 				 i915_gem_next_request_seqno(dev, ring),
 				 ring);