diff options
| author |   Joshua Ashton <joshua@froggi.es> | 2024-03-07 19:04:31 +0000 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2024-08-07 18:20:07 -0400 |
| commit | 829798c789f567ef6ba4b084c15b7b5f3bd98d51 (patch) | |
| tree | 92de2f0517ca869f95f8ce0066bc1551b85c03ee /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | drm/amdgpu: add golden setting for gc v12 (diff) | |
| download | linux-rng-829798c789f567ef6ba4b084c15b7b5f3bd98d51.tar.xz linux-rng-829798c789f567ef6ba4b084c15b7b5f3bd98d51.zip | |
drm/amdgpu: Forward soft recovery errors to userspace
As we discussed before[1], soft recovery should be
forwarded to userspace, or we can get into a really
bad state where apps will keep submitting hanging
command buffers cascading us to a hard reset.
1: https://lore.kernel.org/all/bf23d5ed-9a6b-43e7-84ee-8cbfd0d60f18@froggi.es/
Signed-off-by: Joshua Ashton <joshua@froggi.es>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 434967aadbbbe3ad9103cc29e9a327de20fdba01)
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_job.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index e238f2832f65..908e13455152 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -264,9 +264,8 @@ amdgpu_job_prepare_job(struct drm_sched_job *sched_job, struct dma_fence *fence = NULL; int r; - /* Ignore soft recovered fences here */ r = drm_sched_entity_error(s_entity); - if (r && r != -ENODATA) + if (r) goto error; if (!fence && job->gang_submit) |