diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2025-12-12 19:46:48 +0300 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2026-03-04 15:21:02 +0300 |
| commit | d89aef80790f488d5123179326fa9ee8d5be67bc (patch) | |
| tree | a3e3fb620ff08cb038a937036e3a334aa7eb1353 /drivers/gpu | |
| parent | 11718976c53a258c4d107aa05d68773379d0006f (diff) | |
| download | linux-d89aef80790f488d5123179326fa9ee8d5be67bc.tar.xz | |
drm/amdgpu: avoid a warning in timedout job handler
[ Upstream commit c8cf9ddc549fb93cb5a35f3fe23487b1e6707e74 ]
Only set an error on the fence if the fence is not
signalled. We can end up with a warning if the
per queue reset path signals the fence and sets an error
as part of the reset, but fails to recover.
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 7e6057a6e7f1..ba9a9adca0bf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -132,7 +132,8 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) amdgpu_vm_put_task_info(ti); } - dma_fence_set_error(&s_job->s_fence->finished, -ETIME); + if (dma_fence_get_status(&s_job->s_fence->finished) == 0) + dma_fence_set_error(&s_job->s_fence->finished, -ETIME); /* attempt a per ring reset */ if (amdgpu_gpu_recovery && |