diff options
| author | Daniel Vetter <[email protected]> | 2024-08-27 12:09:45 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2024-08-27 12:09:45 +0000 |
| commit | 4461e9e5c374f8c11fee8e4a0e3290b072cfd538 (patch) | |
| tree | 3bb5c91e53e98e6b80020e63d2d3ec14f94c0533 /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | Merge tag 'drm-intel-gt-next-2024-08-23' of https://gitlab.freedesktop.org/dr... (diff) | |
| parent | Linux 6.11-rc5 (diff) | |
| download | kernel-4461e9e5c374f8c11fee8e4a0e3290b072cfd538.tar.gz kernel-4461e9e5c374f8c11fee8e4a0e3290b072cfd538.zip | |
Merge v6.11-rc5 into drm-next
amdgpu pr conconflicts due to patches cherry-picked to -fixes, I might
as well catch up with a backmerge and handle them all. Plus both misc
and intel maintainers asked for a backmerge anyway.
Signed-off-by: Daniel Vetter <[email protected]>
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) |