Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: Revert 'guc_id' from i915_request tracepoint

Avoid adding backend specific data to the tracepoints outside of
the LOW_LEVEL_TRACEPOINTS kernel config protection. These bits of
information are bound to change depending on the selected submission
method per platform and are not necessarily possible to maintain in
the future.

Fixes: dbf9da8d55ef ("drm/i915/guc: Add trace point for GuC submit")
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: John Harrison <john.c.harrison@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211027093255.66489-1-joonas.lahtinen@linux.intel.com

+2 -5
+2 -5
drivers/gpu/drm/i915/i915_trace.h
··· 794 794 TP_STRUCT__entry( 795 795 __field(u32, dev) 796 796 __field(u64, ctx) 797 - __field(u32, guc_id) 798 797 __field(u16, class) 799 798 __field(u16, instance) 800 799 __field(u32, seqno) ··· 804 805 __entry->dev = rq->engine->i915->drm.primary->index; 805 806 __entry->class = rq->engine->uabi_class; 806 807 __entry->instance = rq->engine->uabi_instance; 807 - __entry->guc_id = rq->context->guc_id.id; 808 808 __entry->ctx = rq->fence.context; 809 809 __entry->seqno = rq->fence.seqno; 810 810 __entry->tail = rq->tail; 811 811 ), 812 812 813 - TP_printk("dev=%u, engine=%u:%u, guc_id=%u, ctx=%llu, seqno=%u, tail=%u", 813 + TP_printk("dev=%u, engine=%u:%u, ctx=%llu, seqno=%u, tail=%u", 814 814 __entry->dev, __entry->class, __entry->instance, 815 - __entry->guc_id, __entry->ctx, __entry->seqno, 816 - __entry->tail) 815 + __entry->ctx, __entry->seqno, __entry->tail) 817 816 ); 818 817 819 818 DEFINE_EVENT(i915_request, i915_request_add,