drm/i915/trace: Remove engine out of the context sandwich
In the string tracepoint representation we ended up with the engine sandwiched between context hardware id and context fence id. Move the two pieces of context data together for redability. Binary records are left as is, that is both fields remaing under the existing name and ordering. v2: * Do not consolidate the printk format, just reorder. (Lionel) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180525082642.18246-2-tvrtko.ursulin@linux.intel.com
This commit is contained in:
parent
2956e970f0
commit
f24e74a7b7
|
@ -638,9 +638,9 @@ TRACE_EVENT(i915_request_queue,
|
|||
__entry->flags = flags;
|
||||
),
|
||||
|
||||
TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, flags=0x%x",
|
||||
__entry->dev, __entry->hw_id, __entry->class,
|
||||
__entry->instance, __entry->ctx, __entry->seqno,
|
||||
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, flags=0x%x",
|
||||
__entry->dev, __entry->class, __entry->instance,
|
||||
__entry->hw_id, __entry->ctx, __entry->seqno,
|
||||
__entry->flags)
|
||||
);
|
||||
|
||||
|
@ -668,9 +668,9 @@ DECLARE_EVENT_CLASS(i915_request,
|
|||
__entry->global = rq->global_seqno;
|
||||
),
|
||||
|
||||
TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, global=%u",
|
||||
__entry->dev, __entry->hw_id, __entry->class,
|
||||
__entry->instance, __entry->ctx, __entry->seqno,
|
||||
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u",
|
||||
__entry->dev, __entry->class, __entry->instance,
|
||||
__entry->hw_id, __entry->ctx, __entry->seqno,
|
||||
__entry->global)
|
||||
);
|
||||
|
||||
|
@ -718,9 +718,9 @@ TRACE_EVENT(i915_request_in,
|
|||
__entry->port = port;
|
||||
),
|
||||
|
||||
TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, prio=%u, global=%u, port=%u",
|
||||
__entry->dev, __entry->hw_id, __entry->class,
|
||||
__entry->instance, __entry->ctx, __entry->seqno,
|
||||
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, prio=%u, global=%u, port=%u",
|
||||
__entry->dev, __entry->class, __entry->instance,
|
||||
__entry->hw_id, __entry->ctx, __entry->seqno,
|
||||
__entry->prio, __entry->global_seqno, __entry->port)
|
||||
);
|
||||
|
||||
|
@ -750,9 +750,9 @@ TRACE_EVENT(i915_request_out,
|
|||
__entry->completed = i915_request_completed(rq);
|
||||
),
|
||||
|
||||
TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, global=%u, completed?=%u",
|
||||
__entry->dev, __entry->hw_id, __entry->class,
|
||||
__entry->instance, __entry->ctx, __entry->seqno,
|
||||
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u, completed?=%u",
|
||||
__entry->dev, __entry->class, __entry->instance,
|
||||
__entry->hw_id, __entry->ctx, __entry->seqno,
|
||||
__entry->global_seqno, __entry->completed)
|
||||
);
|
||||
|
||||
|
@ -842,9 +842,9 @@ TRACE_EVENT(i915_request_wait_begin,
|
|||
__entry->flags = flags;
|
||||
),
|
||||
|
||||
TP_printk("dev=%u, hw_id=%u, engine=%u:%u, ctx=%u, seqno=%u, global=%u, blocking=%u, flags=0x%x",
|
||||
__entry->dev, __entry->hw_id, __entry->class,
|
||||
__entry->instance, __entry->ctx, __entry->seqno,
|
||||
TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u, blocking=%u, flags=0x%x",
|
||||
__entry->dev, __entry->class, __entry->instance,
|
||||
__entry->hw_id, __entry->ctx, __entry->seqno,
|
||||
__entry->global, !!(__entry->flags & I915_WAIT_LOCKED),
|
||||
__entry->flags)
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue