drm/i915/gt: Use ENGINE_TRACE for tracing.

Instead of drm_err(), prefer gt_err() and ENGINE_TRACE()
for GEM tracing in i915. So, it will be good to use ENGINE_TRACE()
over drm_err() drm_device based logging for engine debug log.

v2: Bit more specific in commit description (Andi)

v3: Use gt_err() along with ENGINE_TRACE() in place of drm_err() (Andi)

Signed-off-by: Nitin Gote <nitin.r.gote@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241217100058.2819053-1-nitin.r.gote@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index d56410863f269c780646b2399d1fac630c96475c..458e29d89978df7482f42174fecc45e2ef41afe6 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -26,6 +26,7 @@
 #include "shmem_utils.h"
 #include "intel_engine_heartbeat.h"
 #include "intel_engine_pm.h"
+#include "intel_gt_print.h"
 
 /* Rough estimate of the typical request size, performing a flush,
  * set-context and then emitting the batch.
@@ -287,16 +288,16 @@ static int xcs_resume(struct intel_engine_cs *engine)
        return 0;
 
 err:
-       drm_err(&engine->i915->drm,
-               "%s initialization failed; "
-               "ctl %08x (valid? %d) head %08x [%08x] tail %08x [%08x] start %08x [expected %08x]\n",
-               engine->name,
-               ENGINE_READ(engine, RING_CTL),
-               ENGINE_READ(engine, RING_CTL) & RING_VALID,
-               ENGINE_READ(engine, RING_HEAD), ring->head,
-               ENGINE_READ(engine, RING_TAIL), ring->tail,
-               ENGINE_READ(engine, RING_START),
-               i915_ggtt_offset(ring->vma));
+       gt_err(engine->gt, "%s initialization failed\n", engine->name);
+       ENGINE_TRACE(engine,
+                    "ctl %08x (valid? %d) head %08x [%08x] tail %08x [%08x] start %08x [expected %08x]\n",
+                    ENGINE_READ(engine, RING_CTL),
+                    ENGINE_READ(engine, RING_CTL) & RING_VALID,
+                    ENGINE_READ(engine, RING_HEAD), ring->head,
+                    ENGINE_READ(engine, RING_TAIL), ring->tail,
+                    ENGINE_READ(engine, RING_START),
+                    i915_ggtt_offset(ring->vma));
+       GEM_TRACE_DUMP();
        return -EIO;
 }