[PATCH 68/73] idle-active

[Chris Wilson]

---
 drivers/gpu/drm/i915/gt/intel_engine_cs.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 7dbb15e17757..e25772d8b0cd 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -1237,15 +1237,7 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)
 	if (!intel_engine_pm_is_awake(engine))
 		return true;
 
-	/* Waiting to drain ELSP? */
-	if (execlists_active(&engine->execlists)) {
-		synchronize_hardirq(engine->i915->drm.pdev->irq);
-
-		intel_engine_flush_submission(engine);
-
-		if (execlists_active(&engine->execlists))
-			return false;
-	}
+	intel_engine_flush_submission(engine);
 
 	/* ELSP is empty, but there are ready requests? E.g. after reset */
 	if (!i915_sched_is_idle(&engine->active))
-- 
2.20.1