diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-11-30 15:58:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-11-30 15:58:57 +1000 |
| commit | f513a19a603a76965f3eeb88a45c4442dac035c1 (patch) | |
| tree | ddb136197fde03141b9a9a88756861c8e3220f4b /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | 02339a83dc828cf1b6dfcb42502f80f7c8d7e33f (diff) | |
| parent | 10d2d1fc05f03ee1626b60761a3425622767513e (diff) | |
| download | linux-f513a19a603a76965f3eeb88a45c4442dac035c1.tar.gz linux-f513a19a603a76965f3eeb88a45c4442dac035c1.tar.bz2 linux-f513a19a603a76965f3eeb88a45c4442dac035c1.zip | |
Merge tag 'amd-drm-next-6.2-2022-11-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-6.2-2022-11-25:
amdgpu:
- Old GCC fix
- GFX11 fixes
- PSP suspend/resume fix
- PCI ref count fix
- DC KASAN fix
- DCN 3.2.x fixes
- Dell platform suspend/resume fixes
- DCN 3.1.4 fixes
- RAS fixes
- SMU 13.x fixes
- Flex array changes
- VCN 4.0 RAS updates
- Add missing licsense to some files
- Documentation updates
- SR-IOV fixes
- DP MST DSC fix
amdkfd:
- Fix topology locking in error case
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221125180519.6389-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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 032651a655f0..7f1ca90a552c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -174,7 +174,12 @@ static void amdgpu_job_free_cb(struct drm_sched_job *s_job) drm_sched_job_cleanup(s_job); amdgpu_sync_free(&job->explicit_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, |