diff options
| author | Eric Huang <jinhuieric.huang@amd.com> | 2024-06-06 11:37:20 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2024-06-14 16:15:58 -0400 |
| commit | 7bed1df814cd61029f56eecd322e23190d50d93b (patch) | |
| tree | d175620531fb1d223217cc4be96a5c5842d7f79a | |
| parent | 6218bd6b22d777ba02cde098f2f2f61a23262d96 (diff) | |
drm/amdgpu: fix NULL pointer in amdgpu_reset_get_desc
amdgpu_job_ring may return NULL, which causes kernel NULL
pointer error, using another way to print ring name instead
of ring->name.
Suggested-by: Lijo Lazar <Lijo.Lazar@amd.com>
Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c index 9deb41d61e8d..66c1a868c0e1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c @@ -164,16 +164,14 @@ void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain) void amdgpu_reset_get_desc(struct amdgpu_reset_context *rst_ctxt, char *buf, size_t len) { - struct amdgpu_ring *ring; - if (!buf || !len) return; switch (rst_ctxt->src) { case AMDGPU_RESET_SRC_JOB: if (rst_ctxt->job) { - ring = amdgpu_job_ring(rst_ctxt->job); - snprintf(buf, len, "job hang on ring:%s", ring->name); + snprintf(buf, len, "job hang on ring:%s", + rst_ctxt->job->base.sched->name); } else { strscpy(buf, "job hang", len); } |