[3/3] drm/i915/trace: Context field needs to be 64-bit wide

Commit Message

Tvrtko Ursulin May 25, 2018, 8:26 a.m. UTC

From: Tvrtko Ursulin <[e-mail]>

Underlaying field is u64 so the tracepoint needs to be as well.

Signed-off-by: Tvrtko Ursulin <[e-mail]>
Suggested-by: Chris Wilson <[e-mail]>
---
 drivers/gpu/drm/i915/i915_trace.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Comments

Chris Wilson May 25, 2018, 8:50 a.m. UTC | #1

Quoting Tvrtko Ursulin (2018-05-25 09:26:42)
> From: Tvrtko Ursulin <[e-mail]>
> 
> Underlaying field is u64 so the tracepoint needs to be as well.
> 
> Signed-off-by: Tvrtko Ursulin <[e-mail]>
> Suggested-by: Chris Wilson <[e-mail]>
> ---
>  drivers/gpu/drm/i915/i915_trace.h | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
> index bac582ed3a0b..009862261218 100644
> --- a/drivers/gpu/drm/i915/i915_trace.h
> +++ b/drivers/gpu/drm/i915/i915_trace.h
> @@ -623,7 +623,7 @@ TRACE_EVENT(i915_request_queue,
>                              __field(u32, hw_id)
>                              __field(u16, class)
>                              __field(u16, instance)
> -                            __field(u32, ctx)
> +                            __field(u64, ctx)

Hmm, we have a hole before the u64 if my counting is correct.

Hmm, hw_id is more related to the global seqno wouldn't you say? :)
-Chris

Patch

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index bac582ed3a0b..009862261218 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -623,7 +623,7 @@  TRACE_EVENT(i915_request_queue,
 			     __field(u32, hw_id)
 			     __field(u16, class)
 			     __field(u16, instance)
-			     __field(u32, ctx)
+			     __field(u64, ctx)
 			     __field(u32, seqno)
 			     __field(u32, flags)
 			     ),
@@ -638,7 +638,7 @@  TRACE_EVENT(i915_request_queue,
 			   __entry->flags = flags;
 			   ),
 
-	    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, flags=0x%x",
+	    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, flags=0x%x",
 		      __entry->dev, __entry->class, __entry->instance,
 		      __entry->hw_id, __entry->ctx, __entry->seqno,
 		      __entry->flags)
@@ -653,7 +653,7 @@  DECLARE_EVENT_CLASS(i915_request,
 			     __field(u32, hw_id)
 			     __field(u16, class)
 			     __field(u16, instance)
-			     __field(u32, ctx)
+			     __field(u64, ctx)
 			     __field(u32, seqno)
 			     __field(u32, global)
 			     ),
@@ -668,7 +668,7 @@  DECLARE_EVENT_CLASS(i915_request,
 			   __entry->global = rq->global_seqno;
 			   ),
 
-	    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u",
+	    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, global=%u",
 		      __entry->dev, __entry->class, __entry->instance,
 		      __entry->hw_id, __entry->ctx, __entry->seqno,
 		      __entry->global)
@@ -699,7 +699,7 @@  TRACE_EVENT(i915_request_in,
 			     __field(u32, hw_id)
 			     __field(u16, class)
 			     __field(u16, instance)
-			     __field(u32, ctx)
+			     __field(u64, ctx)
 			     __field(u32, seqno)
 			     __field(u32, global_seqno)
 			     __field(u32, port)
@@ -718,7 +718,7 @@  TRACE_EVENT(i915_request_in,
 			   __entry->port = port;
 			   ),
 
-	    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, prio=%u, global=%u, port=%u",
+	    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, 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)
@@ -733,7 +733,7 @@  TRACE_EVENT(i915_request_out,
 			     __field(u32, hw_id)
 			     __field(u16, class)
 			     __field(u16, instance)
-			     __field(u32, ctx)
+			     __field(u64, ctx)
 			     __field(u32, seqno)
 			     __field(u32, global_seqno)
 			     __field(u32, completed)
@@ -750,7 +750,7 @@  TRACE_EVENT(i915_request_out,
 			   __entry->completed = i915_request_completed(rq);
 			   ),
 
-		    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u, completed?=%u",
+		    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, seqno=%u, global=%u, completed?=%u",
 			      __entry->dev, __entry->class, __entry->instance,
 			      __entry->hw_id, __entry->ctx, __entry->seqno,
 			      __entry->global_seqno, __entry->completed)
@@ -819,7 +819,7 @@  TRACE_EVENT(i915_request_wait_begin,
 			     __field(u32, hw_id)
 			     __field(u16, class)
 			     __field(u16, instance)
-			     __field(u32, ctx)
+			     __field(u64, ctx)
 			     __field(u32, seqno)
 			     __field(u32, global)
 			     __field(unsigned int, flags)
@@ -842,7 +842,7 @@  TRACE_EVENT(i915_request_wait_begin,
 			   __entry->flags = flags;
 			   ),
 
-	    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%u, seqno=%u, global=%u, blocking=%u, flags=0x%x",
+	    TP_printk("dev=%u, engine=%u:%u, hw_id=%u, ctx=%llu, 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),