Commit 0be73284 authored by Chris Wilson's avatar Chris Wilson
Browse files

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



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 0ac74c6b

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -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;