From: Chris Wilson Date: Mon, 6 Dec 2010 14:36:27 +0000 (+0000) Subject: drm/i915: Wait for the bo if a display flip is pipelined on the other ring X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0be732841fb925b6f1242211ea211c022b6ac26c;p=deliverable%2Flinux.git drm/i915: Wait for the bo if a display flip is pipelined on the other ring Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e7733333767d..b57ce033e42a 100644 --- 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;