drm/i915: Wait for the bo if a display flip is pipelined on the other…

… ring Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
git-mirror · Dec 6, 2010 · 0be7328 · 0be7328
1 parent 0ac74c6
commit 0be7328
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/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;