Skip to content

Commit 829798c

Browse files
misyltoadalexdeucher
authored andcommitted
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 434967a) Cc: [email protected]
1 parent 8ff3bb4 commit 829798c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_job.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,8 @@ amdgpu_job_prepare_job(struct drm_sched_job *sched_job,
264264
struct dma_fence *fence = NULL;
265265
int r;
266266

267-
/* Ignore soft recovered fences here */
268267
r = drm_sched_entity_error(s_entity);
269-
if (r && r != -ENODATA)
268+
if (r)
270269
goto error;
271270

272271
if (!fence && job->gang_submit)

0 commit comments

Comments
 (0)