On 12/01/2023 02:53, John.C.Harrison@xxxxxxxxx wrote:
From: John Harrison <John.C.Harrison@xxxxxxxxx>
A hang situation has been observed where the only requests on the
context were either completed or not yet started according to the
breaadcrumbs. However, the register state claimed a batch was (maybe)
in progress. So, allow capture of the pending request on the grounds
that this might be better than nothing.
Signed-off-by: John Harrison <John.C.Harrison@xxxxxxxxx>
---
drivers/gpu/drm/i915/i915_gpu_error.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index bd2cf7d235df0..2e338a9667a4b 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1628,11 +1628,9 @@ capture_engine(struct intel_engine_cs *engine,
if (ce) {
intel_engine_clear_hung_context(engine);
rq = intel_context_find_active_request(ce);
- if (rq && !i915_request_started(rq)) {
- drm_info(&engine->gt->i915->drm, "Got hung context on %s with no active request!\n",
- engine->name);
- rq = NULL;
- }
+ if (rq && !i915_request_started(rq))
+ drm_info(&engine->gt->i915->drm, "Confused - active request not yet started: %lld:%lld, ce = 0x%04X/%s!\n",
+ rq->fence.context, rq->fence.seqno, ce->guc_id.id, engine->name);
Ah you change active to started in this patch! :)
I suggest no "ce" in user visible messages and maybe stick with the
convention grep suggest is already established:
"Hung context with active request %lld:%lld [0x%04X] not started!"
Regards,
Tvrtko
} else {
/*
* Getting here with GuC enabled means it is a forced error capture
