[Intel-gfx] [PATCH] TGL HAX drm/i915/tgl: Defer direct submission from interrupt context

[Chris Wilson]

---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index ef9eb3330a37..8906d86c76de 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -2167,10 +2167,14 @@ static void __submit_queue_imm(struct intel_engine_cs *engine)
 {
 	struct intel_engine_execlists * const execlists = &engine->execlists;
 
+	if (READ_ONCE(engine->execlists.pending[0]))
+		return;
+
 	if (reset_in_progress(execlists))
 		return; /* defer until we restart the engine following reset */
 
-	if (execlists->tasklet.func == execlists_submission_tasklet)
+	if (execlists->tasklet.func == execlists_submission_tasklet &&
+	    !in_irq())
 		__execlists_submission_tasklet(engine);
 	else
 		tasklet_hi_schedule(&execlists->tasklet);
-- 
2.23.0