Skip to content

Commit 3bfd1af

Browse files
committed
drm: amdgpu: Create amdgpu_vm_print_task_info()
To avoid repetitive code in amdgpu, create a function that prints the content of struct amdgpu_task_info. Reviewed-by: Christian König <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: André Almeida <[email protected]>
1 parent 2a4f069 commit 3bfd1af

File tree

8 files changed

+18
-22
lines changed

8 files changed

+18
-22
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_job.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job)
124124

125125
ti = amdgpu_vm_get_task_info_pasid(ring->adev, job->pasid);
126126
if (ti) {
127-
dev_err(adev->dev,
128-
"Process information: process %s pid %d thread %s pid %d\n",
129-
ti->process_name, ti->tgid, ti->task_name, ti->pid);
127+
amdgpu_vm_print_task_info(adev, ti);
130128
amdgpu_vm_put_task_info(ti);
131129
}
132130

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3157,3 +3157,12 @@ bool amdgpu_vm_is_bo_always_valid(struct amdgpu_vm *vm, struct amdgpu_bo *bo)
31573157
{
31583158
return bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv;
31593159
}
3160+
3161+
void amdgpu_vm_print_task_info(struct amdgpu_device *adev,
3162+
struct amdgpu_task_info *task_info)
3163+
{
3164+
dev_err(adev->dev,
3165+
" Process %s pid %d thread %s pid %d\n",
3166+
task_info->process_name, task_info->tgid,
3167+
task_info->task_name, task_info->pid);
3168+
}

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,4 +668,7 @@ void amdgpu_vm_tlb_fence_create(struct amdgpu_device *adev,
668668
struct amdgpu_vm *vm,
669669
struct dma_fence **fence);
670670

671+
void amdgpu_vm_print_task_info(struct amdgpu_device *adev,
672+
struct amdgpu_task_info *task_info);
673+
671674
#endif

drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,7 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev,
164164
entry->src_id, entry->ring_id, entry->vmid, entry->pasid);
165165
task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
166166
if (task_info) {
167-
dev_err(adev->dev,
168-
" in process %s pid %d thread %s pid %d\n",
169-
task_info->process_name, task_info->tgid,
170-
task_info->task_name, task_info->pid);
167+
amdgpu_vm_print_task_info(adev, task_info);
171168
amdgpu_vm_put_task_info(task_info);
172169
}
173170

drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,7 @@ static int gmc_v11_0_process_interrupt(struct amdgpu_device *adev,
134134
entry->src_id, entry->ring_id, entry->vmid, entry->pasid);
135135
task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
136136
if (task_info) {
137-
dev_err(adev->dev,
138-
" in process %s pid %d thread %s pid %d)\n",
139-
task_info->process_name, task_info->tgid,
140-
task_info->task_name, task_info->pid);
137+
amdgpu_vm_print_task_info(adev, task_info);
141138
amdgpu_vm_put_task_info(task_info);
142139
}
143140

drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,7 @@ static int gmc_v12_0_process_interrupt(struct amdgpu_device *adev,
127127
entry->src_id, entry->ring_id, entry->vmid, entry->pasid);
128128
task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
129129
if (task_info) {
130-
dev_err(adev->dev,
131-
" in process %s pid %d thread %s pid %d)\n",
132-
task_info->process_name, task_info->tgid,
133-
task_info->task_name, task_info->pid);
130+
amdgpu_vm_print_task_info(adev, task_info);
134131
amdgpu_vm_put_task_info(task_info);
135132
}
136133

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,9 +1458,7 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev,
14581458

14591459
task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
14601460
if (task_info) {
1461-
dev_err(adev->dev, " for process %s pid %d thread %s pid %d\n",
1462-
task_info->process_name, task_info->tgid,
1463-
task_info->task_name, task_info->pid);
1461+
amdgpu_vm_print_task_info(adev, task_info);
14641462
amdgpu_vm_put_task_info(task_info);
14651463
}
14661464

drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -641,10 +641,7 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
641641

642642
task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
643643
if (task_info) {
644-
dev_err(adev->dev,
645-
" for process %s pid %d thread %s pid %d)\n",
646-
task_info->process_name, task_info->tgid,
647-
task_info->task_name, task_info->pid);
644+
amdgpu_vm_print_task_info(adev, task_info);
648645
amdgpu_vm_put_task_info(task_info);
649646
}
650647

0 commit comments

Comments
 (0)