---

yaml --- r: 228792 b: refs/heads/master c: 0be7328 h: refs/heads/master v: v3
git-mirror · Dec 6, 2010 · 8fbd600 · 8fbd600
1 parent 3aefbd5
commit 8fbd600
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: 0ac74c6b3386f0413baf48f6d61850650e0dc4ab
+refs/heads/master: 0be732841fb925b6f1242211ea211c022b6ac26c
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2926,7 +2926,7 @@ i915_gem_object_set_to_display_plane(struct drm_i915_gem_object *obj,
 	i915_gem_object_flush_gpu_write_domain(obj);
 
 	/* Currently, we are always called from an non-interruptible context. */
-	if (!pipelined) {
+	if (pipelined != obj->ring) {
 		ret = i915_gem_object_wait_rendering(obj, false);
 		if (ret)
 			return ret;