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>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e7733333767d4383af06d1ca4c9c718c2aeb456b..b57ce033e42a1caaa4852d0d4b74b8d667e9a61f 100644 (file)
--- 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;