drm/amdgpu: add VM pointer to id trace

Because of the scheduler all traces come from the same thread now and
can't be distincted otherwise.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@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 2b94c6391086bd1a7c4f6aed3373667f0d42f16a..e7d2676839e1c0b88bea1777b926c8ac7784bf50 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
@@ -100,18 +100,21 @@ TRACE_EVENT(amdgpu_sched_run_job,
 
 
 TRACE_EVENT(amdgpu_vm_grab_id,
-           TP_PROTO(unsigned vmid, int ring),
-           TP_ARGS(vmid, ring),
+           TP_PROTO(struct amdgpu_vm *vm, unsigned vmid, int ring),
+           TP_ARGS(vm, vmid, ring),
            TP_STRUCT__entry(
+                            __field(struct amdgpu_vm *, vm)
                             __field(u32, vmid)
                             __field(u32, ring)
                             ),
 
            TP_fast_assign(
+                          __entry->vm = vm;
                           __entry->vmid = vmid;
                           __entry->ring = ring;
                           ),
-           TP_printk("vmid=%u, ring=%u", __entry->vmid, __entry->ring)
+           TP_printk("vm=%p, id=%u, ring=%u", __entry->vm, __entry->vmid,
+                     __entry->ring)
 );
 
 TRACE_EVENT(amdgpu_vm_bo_map,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index cc28bdc02078a1b39700616e2455307cf8608817..edbb3ff4e73128cd033241523bb6e24676168bd2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -174,7 +174,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
 
                owner = atomic_long_read(&adev->vm_manager.ids[id].owner);
                if (owner == (long)vm) {
-                       trace_amdgpu_vm_grab_id(vm_id->id, ring->idx);
+                       trace_amdgpu_vm_grab_id(vm, vm_id->id, ring->idx);
                        return 0;
                }
        }
@@ -190,7 +190,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
                if (fence == NULL) {
                        /* found a free one */
                        vm_id->id = i;
-                       trace_amdgpu_vm_grab_id(i, ring->idx);
+                       trace_amdgpu_vm_grab_id(vm, i, ring->idx);
                        return 0;
                }
 
@@ -209,7 +209,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
                        fence  = adev->vm_manager.ids[choices[i]].active;
                        vm_id->id = choices[i];
 
-                       trace_amdgpu_vm_grab_id(choices[i], ring->idx);
+                       trace_amdgpu_vm_grab_id(vm, choices[i], ring->idx);
                        return amdgpu_sync_fence(ring->adev, sync, fence);
                }
        }