diff options
| author | Joshua Ashton <[email protected]> | 2024-03-07 19:04:31 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2024-08-07 18:20:07 -0400 |
| commit | 829798c789f567ef6ba4b084c15b7b5f3bd98d51 (patch) | |
| tree | 92de2f0517ca869f95f8ce0066bc1551b85c03ee | |
| parent | 8ff3bb44cc94b74ebd57fe3be9dedb98dbf92771 (diff) | |
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/[email protected]/
Signed-off-by: Joshua Ashton <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Signed-off-by: Christian König <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
(cherry picked from commit 434967aadbbbe3ad9103cc29e9a327de20fdba01)
Cc: [email protected]
| -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) |