Skip to contentSkip to conversation

drm/amdgpu: change trace event parameter name from 'driect' to 'immediate'

PATCH In review Kevin Wang 2 participants 3 messages Dec 7, 2020

Subsystems (2)
lore
Share & tools
lore

Kevin Wang

author
#0 lore raw

PATCH 1/1 drm/amdgpu: change trace event parameter name from 'driect' to 'immediate'

s/direct/immediate/g

amdgpu vm has renamed parameter name from 'direct' to 'immedate'. however, the trace event is not updated yet.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +12 -12
index ee9480d14cbc..324d5e3f3579 100644
@@ -366,15 +366,15 @@ TRACE_EVENT(amdgpu_vm_update_ptes,
 
 TRACE_EVENT(amdgpu_vm_set_ptes,
 	    TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,
-		     uint32_t incr, uint64_t flags, bool direct),
-	    TP_ARGS(pe, addr, count, incr, flags, direct),
+		     uint32_t incr, uint64_t flags, bool immediate),
+	    TP_ARGS(pe, addr, count, incr, flags, immediate),
 	    TP_STRUCT__entry(
 			     __field(u64, pe)
 			     __field(u64, addr)
 			     __field(u32, count)
 			     __field(u32, incr)
 			     __field(u64, flags)
-			     __field(bool, direct)
+			     __field(bool, immediate)
 			     ),
 
 	    TP_fast_assign(
@@ -383,32 +383,32 @@ TRACE_EVENT(amdgpu_vm_set_ptes,
 			   __entry->count = count;
 			   __entry->incr = incr;
 			   __entry->flags = flags;
-			   __entry->direct = direct;
+			   __entry->immediate = immediate;
 			   ),
 	    TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%llx, count=%u, "
-		      "direct=%d", __entry->pe, __entry->addr, __entry->incr,
-		      __entry->flags, __entry->count, __entry->direct)
+		      "immediate=%d", __entry->pe, __entry->addr, __entry->incr,
+		      __entry->flags, __entry->count, __entry->immediate)
 );
 
 TRACE_EVENT(amdgpu_vm_copy_ptes,
-	    TP_PROTO(uint64_t pe, uint64_t src, unsigned count, bool direct),
-	    TP_ARGS(pe, src, count, direct),
+	    TP_PROTO(uint64_t pe, uint64_t src, unsigned count, bool immediate),
+	    TP_ARGS(pe, src, count, immediate),
 	    TP_STRUCT__entry(
 			     __field(u64, pe)
 			     __field(u64, src)
 			     __field(u32, count)
-			     __field(bool, direct)
+			     __field(bool, immediate)
 			     ),
 
 	    TP_fast_assign(
 			   __entry->pe = pe;
 			   __entry->src = src;
 			   __entry->count = count;
-			   __entry->direct = direct;
+			   __entry->immediate = immediate;
 			   ),
-	    TP_printk("pe=%010Lx, src=%010Lx, count=%u, direct=%d",
+	    TP_printk("pe=%010Lx, src=%010Lx, count=%u, immediate=%d",
 		      __entry->pe, __entry->src, __entry->count,
-		      __entry->direct)
+		      __entry->immediate)
 );
 
 TRACE_EVENT(amdgpu_vm_flush,
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer
#1 lore raw

Am 07.12.20 um 07:56 schrieb Kevin Wang:

Quoted 6 lines

s/direct/immediate/g

amdgpu vm has renamed parameter name from 'direct' to 'immedate'. however, the trace event is not updated yet.

There is a small typo in the subject line "driect", apart from that the patch is Reviewed-by: Christian König <[email protected]>.

Thanks for removing one item from my TODO list :)

Regards,
Christian.

Quoted 59 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 +++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +9 -10
index ee9480d14cbc..324d5e3f3579 100644
@@ -366,15 +366,15 @@ TRACE_EVENT(amdgpu_vm_update_ptes,
 
  TRACE_EVENT(amdgpu_vm_set_ptes,
  	    TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,
-		     uint32_t incr, uint64_t flags, bool direct),
-	    TP_ARGS(pe, addr, count, incr, flags, direct),
+		     uint32_t incr, uint64_t flags, bool immediate),
+	    TP_ARGS(pe, addr, count, incr, flags, immediate),
  	    TP_STRUCT__entry(
  			     __field(u64, pe)
  			     __field(u64, addr)
  			     __field(u32, count)
  			     __field(u32, incr)
  			     __field(u64, flags)
-			     __field(bool, direct)
+			     __field(bool, immediate)
  			     ),
 
  	    TP_fast_assign(
@@ -383,32 +383,32 @@ TRACE_EVENT(amdgpu_vm_set_ptes,
  			   __entry->count = count;
  			   __entry->incr = incr;
  			   __entry->flags = flags;
-			   __entry->direct = direct;
+			   __entry->immediate = immediate;
  			   ),
  	    TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%llx, count=%u, "
-		      "direct=%d", __entry->pe, __entry->addr, __entry->incr,
-		      __entry->flags, __entry->count, __entry->direct)
+		      "immediate=%d", __entry->pe, __entry->addr, __entry->incr,
+		      __entry->flags, __entry->count, __entry->immediate)
  );
 
  TRACE_EVENT(amdgpu_vm_copy_ptes,
-	    TP_PROTO(uint64_t pe, uint64_t src, unsigned count, bool direct),
-	    TP_ARGS(pe, src, count, direct),
+	    TP_PROTO(uint64_t pe, uint64_t src, unsigned count, bool immediate),
+	    TP_ARGS(pe, src, count, immediate),
  	    TP_STRUCT__entry(
  			     __field(u64, pe)
  			     __field(u64, src)
  			     __field(u32, count)
-			     __field(bool, direct)
+			     __field(bool, immediate)
  			     ),
 
  	    TP_fast_assign(
  			   __entry->pe = pe;
  			   __entry->src = src;
  			   __entry->count = count;
-			   __entry->direct = direct;

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h TRACE_EVENT(amdgpu_vm_set_ptes, · line 414

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +3 -2
+			   __entry->immediate = immediate;
  			   ),
-	    TP_printk("pe=%010Lx, src=%010Lx, count=%u, direct=%d",
+	    TP_printk("pe=%010Lx, src=%010Lx, count=%u, immediate=%d",
  		      __entry->pe, __entry->src, __entry->count,
-		      __entry->direct)
+		      __entry->immediate)
  );
 
  TRACE_EVENT(amdgpu_vm_flush,

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#2 lore raw

[AMD Official Use Only - Internal Distribution Only]

________________________________
From: Koenig, Christian <[email protected]>
Sent: Monday, December 7, 2020 4:23 PM
To: Wang, Kevin(Yang) <[email protected]>; [email protected] <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: change trace event parameter name from 'driect' to 'immediate'

Am 07.12.20 um 07:56 schrieb Kevin Wang:

Quoted 6 lines

s/direct/immediate/g

amdgpu vm has renamed parameter name from 'direct' to 'immedate'. however, the trace event is not updated yet.

There is a small typo in the subject line "driect", apart from that the patch is Reviewed-by: Christian König <[email protected]>.

Thanks for removing one item from my TODO list :)

Regards,
Christian.

[kevin]:
ok, thank you for reminding me.

Quoted 59 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 24 +++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +9 -10
index ee9480d14cbc..324d5e3f3579 100644
@@ -366,15 +366,15 @@ TRACE_EVENT(amdgpu_vm_update_ptes,
 
  TRACE_EVENT(amdgpu_vm_set_ptes,
           TP_PROTO(uint64_t pe, uint64_t addr, unsigned count,
-                  uint32_t incr, uint64_t flags, bool direct),
-         TP_ARGS(pe, addr, count, incr, flags, direct),
+                  uint32_t incr, uint64_t flags, bool immediate),
+         TP_ARGS(pe, addr, count, incr, flags, immediate),
           TP_STRUCT__entry(
                            __field(u64, pe)
                            __field(u64, addr)
                            __field(u32, count)
                            __field(u32, incr)
                            __field(u64, flags)
-                          __field(bool, direct)
+                          __field(bool, immediate)
                            ),
 
           TP_fast_assign(
@@ -383,32 +383,32 @@ TRACE_EVENT(amdgpu_vm_set_ptes,
                          __entry->count = count;
                          __entry->incr = incr;
                          __entry->flags = flags;
-                        __entry->direct = direct;
+                        __entry->immediate = immediate;
                          ),
           TP_printk("pe=%010Lx, addr=%010Lx, incr=%u, flags=%llx, count=%u, "
-                   "direct=%d", __entry->pe, __entry->addr, __entry->incr,
-                   __entry->flags, __entry->count, __entry->direct)
+                   "immediate=%d", __entry->pe, __entry->addr, __entry->incr,
+                   __entry->flags, __entry->count, __entry->immediate)
  );
 
  TRACE_EVENT(amdgpu_vm_copy_ptes,
-         TP_PROTO(uint64_t pe, uint64_t src, unsigned count, bool direct),
-         TP_ARGS(pe, src, count, direct),
+         TP_PROTO(uint64_t pe, uint64_t src, unsigned count, bool immediate),
+         TP_ARGS(pe, src, count, immediate),
           TP_STRUCT__entry(
                            __field(u64, pe)
                            __field(u64, src)
                            __field(u32, count)
-                          __field(bool, direct)
+                          __field(bool, immediate)
                            ),
 
           TP_fast_assign(
                          __entry->pe = pe;
                          __entry->src = src;
                          __entry->count = count;
-                        __entry->direct = direct;

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h TRACE_EVENT(amdgpu_vm_set_ptes, · line 414

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +3 -2
+                        __entry->immediate = immediate;
                          ),
-         TP_printk("pe=%010Lx, src=%010Lx, count=%u, direct=%d",
+         TP_printk("pe=%010Lx, src=%010Lx, count=%u, immediate=%d",
                     __entry->pe, __entry->src, __entry->count,
-                   __entry->direct)
+                   __entry->immediate)
  );
 
  TRACE_EVENT(amdgpu_vm_flush,

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx