Skip to content

Commit 5ed539e

Browse files
NitinGoteAndi Shyti
authored andcommitted
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 <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 63b81a3 commit 5ed539e

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "shmem_utils.h"
2727
#include "intel_engine_heartbeat.h"
2828
#include "intel_engine_pm.h"
29+
#include "intel_gt_print.h"
2930

3031
/* Rough estimate of the typical request size, performing a flush,
3132
* set-context and then emitting the batch.
@@ -287,16 +288,16 @@ static int xcs_resume(struct intel_engine_cs *engine)
287288
return 0;
288289

289290
err:
290-
drm_err(&engine->i915->drm,
291-
"%s initialization failed; "
292-
"ctl %08x (valid? %d) head %08x [%08x] tail %08x [%08x] start %08x [expected %08x]\n",
293-
engine->name,
294-
ENGINE_READ(engine, RING_CTL),
295-
ENGINE_READ(engine, RING_CTL) & RING_VALID,
296-
ENGINE_READ(engine, RING_HEAD), ring->head,
297-
ENGINE_READ(engine, RING_TAIL), ring->tail,
298-
ENGINE_READ(engine, RING_START),
299-
i915_ggtt_offset(ring->vma));
291+
gt_err(engine->gt, "%s initialization failed\n", engine->name);
292+
ENGINE_TRACE(engine,
293+
"ctl %08x (valid? %d) head %08x [%08x] tail %08x [%08x] start %08x [expected %08x]\n",
294+
ENGINE_READ(engine, RING_CTL),
295+
ENGINE_READ(engine, RING_CTL) & RING_VALID,
296+
ENGINE_READ(engine, RING_HEAD), ring->head,
297+
ENGINE_READ(engine, RING_TAIL), ring->tail,
298+
ENGINE_READ(engine, RING_START),
299+
i915_ggtt_offset(ring->vma));
300+
GEM_TRACE_DUMP();
300301
return -EIO;
301302
}
302303

0 commit comments

Comments
 (0)