Skip to content

Commit 2da21da

Browse files
ickledanvet
authored andcommitted
drm/i915/gt: Always flush the submission queue on checking for idle
We check for idle during debug prints and other debugging actions. Simplify the flow by not touching execlists state. Signed-off-by: Chris Wilson <[email protected]> Reviewed-by: Tvrtko Ursulin <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Daniel Vetter <[email protected]>
1 parent 985458d commit 2da21da

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/gpu/drm/i915/gt/intel_engine_cs.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,14 +1254,8 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)
12541254
return true;
12551255

12561256
/* Waiting to drain ELSP? */
1257-
if (execlists_active(&engine->execlists)) {
1258-
synchronize_hardirq(to_pci_dev(engine->i915->drm.dev)->irq);
1259-
1260-
intel_engine_flush_submission(engine);
1261-
1262-
if (execlists_active(&engine->execlists))
1263-
return false;
1264-
}
1257+
synchronize_hardirq(to_pci_dev(engine->i915->drm.dev)->irq);
1258+
intel_engine_flush_submission(engine);
12651259

12661260
/* ELSP is empty, but there are ready requests? E.g. after reset */
12671261
if (!RB_EMPTY_ROOT(&engine->execlists.queue.rb_root))

0 commit comments

Comments
 (0)