Skip to content

Commit fd2ac11

Browse files
Timur Kristófalexdeucher
authored andcommitted
drm/amdgpu: Fix validating flush_gpu_tlb_pasid()
When a function holds a lock and we return without unlocking it, it deadlocks the kernel. We should always unlock before returning. This commit fixes suspend/resume on SI. Tested on two Tahiti GPUs: FirePro W9000 and R9 280X. Fixes: f4db991 ("drm/amdgpu: validate the flush_gpu_tlb_pasid()") Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/r/202601190121.z9C0uml5-lkp@intel.com/ Signed-off-by: Timur Kristóf <timur.kristof@gmail.com> Signed-off-by: Prike Liang <Prike.Liang@amd.com> Reviewed-by: Prike Liang <Prike.Liang@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit e3a6eff)
1 parent 764a90e commit fd2ac11

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,8 +733,10 @@ int amdgpu_gmc_flush_gpu_tlb_pasid(struct amdgpu_device *adev, uint16_t pasid,
733733

734734
if (!adev->gmc.flush_pasid_uses_kiq || !ring->sched.ready) {
735735

736-
if (!adev->gmc.gmc_funcs->flush_gpu_tlb_pasid)
737-
return 0;
736+
if (!adev->gmc.gmc_funcs->flush_gpu_tlb_pasid) {
737+
r = 0;
738+
goto error_unlock_reset;
739+
}
738740

739741
if (adev->gmc.flush_tlb_needs_extra_type_2)
740742
adev->gmc.gmc_funcs->flush_gpu_tlb_pasid(adev, pasid,

0 commit comments

Comments
 (0)