[Intel-gfx] [PATCH v2 5/9] drm/i915/error: capture errored context based on request context-id

[Arun Siluvery]

From: Dave Gordon <david.s.gordon at intel.com>

Context capture hasn't worked for a while now, probably since the
introduction of execlists; this patch makes it work again by using
a different way of identifying the context of interest.

For: VIZ-2021
Signed-off-by: Dave Gordon <david.s.gordon at intel.com>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index bdbc7ed..c599df6 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -1075,13 +1075,12 @@ static void i915_gem_record_active_context(struct intel_engine_cs *ring,
 			continue;
 		}
 
-		if (!error->ccid)
-			continue;
-
 		if (i915.enable_execlists)
 			base += LRC_PPHWSP_PN * PAGE_SIZE;
 
-		if (base == (error->ccid & PAGE_MASK))
+		if (error->ccid && base == (error->ccid & PAGE_MASK))
+			ering->ctx = i915_error_ggtt_object_create(dev_priv, obj);
+		else if (((base ^ ering->ctx_desc) & 0x00000000FFFFF000ULL) == 0)
 			ering->ctx = i915_error_ggtt_object_create(dev_priv, obj);
 	}
 }
-- 
1.9.1