drm/amdgpu: trace the pd_addr in vm_grab_id as well

Makes matching it to the flushes much easier.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
index 9ca3735c563c225c11868d7cce9785c7ba3d8dbf..26a5f4acf5840ed6218a49cd654b678005431481 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -100,21 +100,24 @@ TRACE_EVENT(amdgpu_sched_run_job,
 
 
 TRACE_EVENT(amdgpu_vm_grab_id,
-           TP_PROTO(struct amdgpu_vm *vm, unsigned vmid, int ring),
-           TP_ARGS(vm, vmid, ring),
+           TP_PROTO(struct amdgpu_vm *vm, int ring, unsigned vmid,
+                    uint64_t pd_addr),
+           TP_ARGS(vm, ring, vmid, pd_addr),
            TP_STRUCT__entry(
                             __field(struct amdgpu_vm *, vm)
-                            __field(u32, vmid)
                             __field(u32, ring)
+                            __field(u32, vmid)
+                            __field(u64, pd_addr)
                             ),
 
            TP_fast_assign(
                           __entry->vm = vm;
-                          __entry->vmid = vmid;
                           __entry->ring = ring;
+                          __entry->vmid = vmid;
+                          __entry->pd_addr = pd_addr;
                           ),
-           TP_printk("vm=%p, id=%u, ring=%u", __entry->vm, __entry->vmid,
-                     __entry->ring)
+           TP_printk("vm=%p, ring=%u, id=%u, pd_addr=%010Lx", __entry->vm,
+                     __entry->ring, __entry->vmid, __entry->pd_addr)
 );
 
 TRACE_EVENT(amdgpu_vm_bo_map,
@@ -231,8 +234,8 @@ TRACE_EVENT(amdgpu_vm_flush,
                           __entry->ring = ring;
                           __entry->id = id;
                           ),
-           TP_printk("pd_addr=%010Lx, ring=%u, id=%u",
-                     __entry->pd_addr, __entry->ring, __entry->id)
+           TP_printk("ring=%u, id=%u, pd_addr=%010Lx",
+                     __entry->ring, __entry->id, __entry->pd_addr)
 );
 
 TRACE_EVENT(amdgpu_bo_list_set,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index ba909245fef5027d052365fb8356669262a543e6..d9dc8bea5e98f51496683d7beddede288c5b4290 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -196,7 +196,8 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
 
                        *vm_id = id->mgr_id - adev->vm_manager.ids;
                        *vm_pd_addr = AMDGPU_VM_NO_FLUSH;
-                       trace_amdgpu_vm_grab_id(vm, *vm_id, ring->idx);
+                       trace_amdgpu_vm_grab_id(vm, ring->idx, *vm_id,
+                                               *vm_pd_addr);
 
                        mutex_unlock(&adev->vm_manager.lock);
                        return 0;
@@ -222,7 +223,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
 
                *vm_id = id->mgr_id - adev->vm_manager.ids;
                *vm_pd_addr = pd_addr;
-               trace_amdgpu_vm_grab_id(vm, *vm_id, ring->idx);
+               trace_amdgpu_vm_grab_id(vm, ring->idx, *vm_id, *vm_pd_addr);
        }
 
        mutex_unlock(&adev->vm_manager.lock);