diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-11-25 10:55:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-11-25 10:55:23 +1000 |
| commit | e57702069b26b8601a33fdc0c9bbe40c6bb9c72f (patch) | |
| tree | 7f84041e91046cdc8cb6d1328322d5cbb4e33965 /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | b65a648865c4a1e717c4f56f5025546b9553189a (diff) | |
| parent | ecb41b71ef90cf4741bcc3286b769dda746b67e6 (diff) | |
| download | linux-e57702069b26b8601a33fdc0c9bbe40c6bb9c72f.tar.gz linux-e57702069b26b8601a33fdc0c9bbe40c6bb9c72f.tar.bz2 linux-e57702069b26b8601a33fdc0c9bbe40c6bb9c72f.zip | |
Merge tag 'amd-drm-fixes-6.1-2022-11-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-6.1-2022-11-23:
amdgpu:
- DCN 3.1.4 fixes
- DP MST DSC deadlock fixes
- HMM userptr fixes
- Fix Aldebaran CU occupancy reporting
- GFX11 fixes
- PSP suspend/resume fix
- DCE12 KASAN fix
- DCN 3.2.x fixes
- Rotated cursor fix
- SMU 13.x fix
- DELL platform suspend/resume fixes
- VCN4 SR-IOV fix
- Display regression fix for polled connectors
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221123143453.8977-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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index abb99cff8b4b..adac650cf544 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -169,7 +169,11 @@ static void amdgpu_job_free_cb(struct drm_sched_job *s_job) amdgpu_sync_free(&job->sync); amdgpu_sync_free(&job->sched_sync); - dma_fence_put(&job->hw_fence); + /* only put the hw fence if has embedded fence */ + if (!job->hw_fence.ops) + kfree(job); + else + dma_fence_put(&job->hw_fence); } void amdgpu_job_set_gang_leader(struct amdgpu_job *job, |