drm/xe/xe_tracer: Align fence output format in ftrace log
authorShuicheng Lin <shuicheng.lin@intel.com>
Wed, 13 Mar 2024 02:50:52 +0000 (02:50 +0000)
committerLucas De Marchi <lucas.demarchi@intel.com>
Wed, 13 Mar 2024 19:36:53 +0000 (12:36 -0700)
The fence print in xe_gt_tlb_invalidation_fence and xe_hw_fence
is with "%p", change fence print in xe_sched_job to "%p" also.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240313025052.1410833-1-shuicheng.lin@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/xe_trace.h

index 846f14507d5ff2ed47ff8c0c4dac573e584ade89..2d56cfc09e42178f4589c24d163ca0104b1c4a89 100644 (file)
@@ -258,7 +258,7 @@ DECLARE_EVENT_CLASS(xe_sched_job,
                             __field(u32, guc_state)
                             __field(u32, flags)
                             __field(int, error)
-                            __field(u64, fence)
+                            __field(struct dma_fence *, fence)
                             __field(u64, batch_addr)
                             ),
 
@@ -269,11 +269,11 @@ DECLARE_EVENT_CLASS(xe_sched_job,
                           atomic_read(&job->q->guc->state);
                           __entry->flags = job->q->flags;
                           __entry->error = job->fence->error;
-                          __entry->fence = (unsigned long)job->fence;
+                          __entry->fence = job->fence;
                           __entry->batch_addr = (u64)job->batch_addr[0];
                           ),
 
-                   TP_printk("fence=0x%016llx, seqno=%u, guc_id=%d, batch_addr=0x%012llx, guc_state=0x%x, flags=0x%x, error=%d",
+                   TP_printk("fence=%p, seqno=%u, guc_id=%d, batch_addr=0x%012llx, guc_state=0x%x, flags=0x%x, error=%d",
                              __entry->fence, __entry->seqno, __entry->guc_id,
                              __entry->batch_addr, __entry->guc_state,
                              __entry->flags, __entry->error)