From b023b714a972bcb4a5b524ff63a1a44bdd77bd50 Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 15 Aug 2024 03:15:06 +0000 Subject: [PATCH] drm/amdgpu: Forward soft recovery errors to userspace From Joshua Ashton 0da0b06165d83a8ecbb6582d9d5a135f9d38a52a in linux-6.6.y/6.6.46 829798c789f567ef6ba4b084c15b7b5f3bd98d51 in mainline linux --- sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c index de9d7f3dc23..99dd86337e8 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.c @@ -258,9 +258,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) -- 2.20.1