aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Ashton <[email protected]>2024-03-07 19:04:31 +0000
committerAlex Deucher <[email protected]>2024-08-06 15:11:01 +0000
commit434967aadbbbe3ad9103cc29e9a327de20fdba01 (patch)
tree65c49450821eafd17753e09ab95a6e15fe1aee31
parentdrm/amdgpu: remove RAS unused paramter 'err_addr' (diff)
downloadkernel-434967aadbbbe3ad9103cc29e9a327de20fdba01.tar.gz
kernel-434967aadbbbe3ad9103cc29e9a327de20fdba01.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/[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]>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_job.c3
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)