1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 10cd051ba29e..217ed3ee1cab 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -990,6 +990,9 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)
                 }
                 local_bh_enable();
 
+                /* Otherwise flush the tasklet if it was on another cpu */
+                tasklet_unlock_wait(t);
+
                 if (READ_ONCE(engine->execlists.active))
                         return false;
         }