From: John Harrison <John.C.Harrison@xxxxxxxxx> It is technically possible to get a hung context without a valid request. In such a situation, try to provide as much information in the error capture as possible rather than just aborting and capturing nothing. Similarly, in the case of an engine reset failure the GuC is not able to report the guilty context. So try a manual search instead of reporting nothing. v2: Tidy up code flow in error capture. Reword some comments/messages. (review feedback from Tvrtko) Also fix up request locking issues from earlier changes noticed during code review of this change. Signed-off-by: John Harrison <John.C.Harrison@xxxxxxxxx> John Harrison (5): drm/i915: Fix request locking during error capture & debugfs dump drm/i915: Allow error capture without a request drm/i915: Allow error capture of a pending request drm/i915/guc: Look for a guilty context when an engine reset fails drm/i915/guc: Add a debug print on GuC triggered reset drivers/gpu/drm/i915/gt/intel_context.c | 1 + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 7 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 32 ++++++++- drivers/gpu/drm/i915/i915_gpu_error.c | 71 ++++++++++++------- 4 files changed, 82 insertions(+), 29 deletions(-) -- 2.39.0