diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-08-09 13:45:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-08-09 13:46:00 +1000 |
| commit | a507e750a1d693a21b233f47db466d9aae895fa2 (patch) | |
| tree | a16a58b22fe3c956c3991b57a71eefc26794b704 /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | 062fd0a6cdb5986745100ab1328d4e475078fda4 (diff) | |
| parent | 6ad9dafba19f15a64f71c2e1a9e3b6932f96628e (diff) | |
| download | linux-a507e750a1d693a21b233f47db466d9aae895fa2.tar.gz linux-a507e750a1d693a21b233f47db466d9aae895fa2.tar.bz2 linux-a507e750a1d693a21b233f47db466d9aae895fa2.zip | |
Merge tag 'amd-drm-fixes-6.11-2024-08-08' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-6.11-2024-08-08:
amdgpu:
- DMCUB fix
- Fix DET programming on some DCNs
- DCC fixes
- DCN 4.0.1 fixes
- SMU 14.0.x update
- MMHUB fix
- DCN 3.1.4 fix
- GC 12.0 fixes
- Fix soft recovery error propogation
- SDMA 7.0 fixes
- DSC fix
drm buddy:
- Add start address to trim function
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240808161134.1227671-1-alexander.deucher@amd.com
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) |