diff options
author | Christian König <christian.koenig@amd.com> | 2016-01-07 12:15:22 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-10 14:16:56 -0500 |
commit | 165e4e07c2cb91658c444ac4dab49473bfb3847b (patch) | |
tree | 5cfffcbbdd9efcc2724429651eeab24e04fcade1 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
parent | 1c343fc9db9e17a86c0681e0a653fd65aa9243ac (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index cc28bdc02078..edbb3ff4e731 100644 --- 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, | |||
174 | 174 | ||
175 | owner = atomic_long_read(&adev->vm_manager.ids[id].owner); | 175 | owner = atomic_long_read(&adev->vm_manager.ids[id].owner); |
176 | if (owner == (long)vm) { | 176 | if (owner == (long)vm) { |
177 | trace_amdgpu_vm_grab_id(vm_id->id, ring->idx); | 177 | trace_amdgpu_vm_grab_id(vm, vm_id->id, ring->idx); |
178 | return 0; | 178 | return 0; |
179 | } | 179 | } |
180 | } | 180 | } |
@@ -190,7 +190,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, | |||
190 | if (fence == NULL) { | 190 | if (fence == NULL) { |
191 | /* found a free one */ | 191 | /* found a free one */ |
192 | vm_id->id = i; | 192 | vm_id->id = i; |
193 | trace_amdgpu_vm_grab_id(i, ring->idx); | 193 | trace_amdgpu_vm_grab_id(vm, i, ring->idx); |
194 | return 0; | 194 | return 0; |
195 | } | 195 | } |
196 | 196 | ||
@@ -209,7 +209,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, | |||
209 | fence = adev->vm_manager.ids[choices[i]].active; | 209 | fence = adev->vm_manager.ids[choices[i]].active; |
210 | vm_id->id = choices[i]; | 210 | vm_id->id = choices[i]; |
211 | 211 | ||
212 | trace_amdgpu_vm_grab_id(choices[i], ring->idx); | 212 | trace_amdgpu_vm_grab_id(vm, choices[i], ring->idx); |
213 | return amdgpu_sync_fence(ring->adev, sync, fence); | 213 | return amdgpu_sync_fence(ring->adev, sync, fence); |
214 | } | 214 | } |
215 | } | 215 | } |