Skip to content

Commit c9a995e

Browse files
ickledanvet
authored andcommitted
drm/i915/gt: Retire unexpected starting state error dumping
We have not seen an occurrence of the false restart state recenty, and if we did see such an event from inside engine-reset, it would deadlock on trying to suspend the tasklet to read the register state (from inside the tasklet). Instead, we inspect the context state before submission which will alert us to any issues prior to execution on HW. Signed-off-by: Chris Wilson <[email protected]> Cc: Mika Kuoppala <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Cc: Andi Shyti <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Daniel Vetter <[email protected]>
1 parent 8bb9251 commit c9a995e

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,31 +2720,11 @@ static void enable_execlists(struct intel_engine_cs *engine)
27202720
enable_error_interrupt(engine);
27212721
}
27222722

2723-
static bool unexpected_starting_state(struct intel_engine_cs *engine)
2724-
{
2725-
bool unexpected = false;
2726-
2727-
if (ENGINE_READ_FW(engine, RING_MI_MODE) & STOP_RING) {
2728-
drm_dbg(&engine->i915->drm,
2729-
"STOP_RING still set in RING_MI_MODE\n");
2730-
unexpected = true;
2731-
}
2732-
2733-
return unexpected;
2734-
}
2735-
27362723
static int execlists_resume(struct intel_engine_cs *engine)
27372724
{
27382725
intel_mocs_init_engine(engine);
2739-
27402726
intel_breadcrumbs_reset(engine->breadcrumbs);
27412727

2742-
if (GEM_SHOW_DEBUG() && unexpected_starting_state(engine)) {
2743-
struct drm_printer p = drm_debug_printer(__func__);
2744-
2745-
intel_engine_dump(engine, &p, NULL);
2746-
}
2747-
27482728
enable_execlists(engine);
27492729

27502730
return 0;

0 commit comments

Comments
 (0)