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 <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/20250617124949.2151549-3-andrealmeid@igalia.com
Signed-off-by: André Almeida <andrealmeid@igalia.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index 75262ce8db27fad4a1f1af00639031b040f21c87..3d887428ca2b5d25a67460843854131ba49cc82e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -124,9 +124,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job)
 
        ti = amdgpu_vm_get_task_info_pasid(ring->adev, job->pasid);
        if (ti) {
-               dev_err(adev->dev,
-                       "Process information: process %s pid %d thread %s pid %d\n",
-                       ti->process_name, ti->tgid, ti->task_name, ti->pid);
+               amdgpu_vm_print_task_info(adev, ti);
                amdgpu_vm_put_task_info(ti);
        }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index de914a39e3f6557f5f1d94ad6691038a3a4de8ef..3bf63eee2d4e79b77520e5bcf0f96671c46329ab 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -3157,3 +3157,12 @@ bool amdgpu_vm_is_bo_always_valid(struct amdgpu_vm *vm, struct amdgpu_bo *bo)
 {
        return bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv;
 }
+
+void amdgpu_vm_print_task_info(struct amdgpu_device *adev,
+                              struct amdgpu_task_info *task_info)
+{
+       dev_err(adev->dev,
+               " Process %s pid %d thread %s pid %d\n",
+               task_info->process_name, task_info->tgid,
+               task_info->task_name, task_info->pid);
+}

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index f3ad687125ad65e0fc94b7a766072724925880b3..9ec5d94200aa0319e982bb1c0374424a57841c75 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -668,4 +668,7 @@ void amdgpu_vm_tlb_fence_create(struct amdgpu_device *adev,
                                 struct amdgpu_vm *vm,
                                 struct dma_fence **fence);
 
+void amdgpu_vm_print_task_info(struct amdgpu_device *adev,
+                              struct amdgpu_task_info *task_info);
+
 #endif

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
index a3e2787501f18f49c1a0ef2700cb79a0b008ae5a..7923f491cf7335d7a7e224520e0564f03b567bac 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
@@ -164,10 +164,7 @@ static int gmc_v10_0_process_interrupt(struct amdgpu_device *adev,
                entry->src_id, entry->ring_id, entry->vmid, entry->pasid);
        task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
        if (task_info) {
-               dev_err(adev->dev,
-                       " in process %s pid %d thread %s pid %d\n",
-                       task_info->process_name, task_info->tgid,
-                       task_info->task_name, task_info->pid);
+               amdgpu_vm_print_task_info(adev, task_info);
                amdgpu_vm_put_task_info(task_info);
        }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
index 72211409227b89f8320807c6f3e07a9d4c4168bc..f15d691e9a2031554510c2a2fd83ca8db17f7bf8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c
@@ -134,10 +134,7 @@ static int gmc_v11_0_process_interrupt(struct amdgpu_device *adev,
                        entry->src_id, entry->ring_id, entry->vmid, entry->pasid);
                task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
                if (task_info) {
-                       dev_err(adev->dev,
-                               " in process %s pid %d thread %s pid %d)\n",
-                               task_info->process_name, task_info->tgid,
-                               task_info->task_name, task_info->pid);
+                       amdgpu_vm_print_task_info(adev, task_info);
                        amdgpu_vm_put_task_info(task_info);
                }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
index b645d3e6a6c81acab011e7136a54239693d156d9..de763105fdfd162a9f5de42766b02e39bf32decc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c
@@ -127,10 +127,7 @@ static int gmc_v12_0_process_interrupt(struct amdgpu_device *adev,
                        entry->src_id, entry->ring_id, entry->vmid, entry->pasid);
                task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
                if (task_info) {
-                       dev_err(adev->dev,
-                               " in process %s pid %d thread %s pid %d)\n",
-                               task_info->process_name, task_info->tgid,
-                               task_info->task_name, task_info->pid);
+                       amdgpu_vm_print_task_info(adev, task_info);
                        amdgpu_vm_put_task_info(task_info);
                }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 99ca08e9bdb58750cf0a152011a5180efac3bacb..b45fa0cea9d27dd4c783e0dfe68097b4f6c6c49b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -1458,9 +1458,7 @@ static int gmc_v8_0_process_interrupt(struct amdgpu_device *adev,
 
                task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
                if (task_info) {
-                       dev_err(adev->dev, " for process %s pid %d thread %s pid %d\n",
-                               task_info->process_name, task_info->tgid,
-                               task_info->task_name, task_info->pid);
+                       amdgpu_vm_print_task_info(adev, task_info);
                        amdgpu_vm_put_task_info(task_info);
                }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 282197f4ffb15a70482985ae2c22cb57667e434e..78f65aea03f8b279b516bef6680dafe7d3cb4c14 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -641,10 +641,7 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev,
 
        task_info = amdgpu_vm_get_task_info_pasid(adev, entry->pasid);
        if (task_info) {
-               dev_err(adev->dev,
-                       " for process %s pid %d thread %s pid %d)\n",
-                       task_info->process_name, task_info->tgid,
-                       task_info->task_name, task_info->pid);
+               amdgpu_vm_print_task_info(adev, task_info);
                amdgpu_vm_put_task_info(task_info);
        }