---

yaml --- r: 228791 b: refs/heads/master c: 0ac74c6 h: refs/heads/master i: 228789: ea8144f 228787: f66273f 228783: 119f6ce v: v3
git-mirror · Dec 6, 2010 · 3aefbd5 · 3aefbd5
1 parent 95f551f
commit 3aefbd5
Show file tree

Hide file tree

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