[PATCH 64/92] mmio-flip-select

[Chris Wilson]

---
 drivers/gpu/drm/i915/intel_display.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ee6ecb5eea1d..d2a7a045b076 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11360,8 +11360,13 @@ static bool use_mmio_flip(struct intel_engine_cs *engine,
 		 !reservation_object_test_signaled_rcu(obj->base.dma_buf->resv,
 						       false))
 		return true;
+	else if (!obj->last_write_req ||
+		 i915_gem_request_completed(obj->last_write_req))
+		return true;
+	else if (engine != obj->last_write_req->engine)
+		return !i915.semaphores;
 	else
-		return engine != i915_gem_request_get_engine(obj->last_write_req);
+		return false;
 }
 
 static void skl_do_mmio_flip(struct intel_crtc *intel_crtc,
-- 
2.8.1