summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2022-10-06 22:53:10 +0300
committerAlex Deucher <alexander.deucher@amd.com>2022-10-11 00:32:56 +0300
commita98cec220aa4b2502704aa0196da1bdc9eb455b4 (patch)
tree350f365af9f47539a0337620d96c06d8f69cb4e9 /drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
parent571c053658926df3321633b7133f574d3e656c81 (diff)
downloadlinux-a98cec220aa4b2502704aa0196da1bdc9eb455b4.tar.xz
drm/amdgpu: fix SDMA suspend/resume on SR-IOV
Update all SDMA versions that support SR-IOV to properly tear down the ttm buffer functions on suspend. Tested-by: Bokun Zhang <Bokun.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index c2ee53c2dd1b..809eca54fc61 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -1349,19 +1349,15 @@ static int sdma_v5_2_hw_fini(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
- /*
- * Under SRIOV, the VF cannot single-mindedly stop SDMA engine
- * However, we still need to clean up the DRM entity
- * Therefore, we will re-enable SDMA afterwards.
- */
- sdma_v5_2_ctx_switch_enable(adev, false);
- sdma_v5_2_enable(adev, false);
-
if (amdgpu_sriov_vf(adev)) {
- sdma_v5_2_enable(adev, true);
- sdma_v5_2_ctx_switch_enable(adev, true);
+ /* disable the scheduler for SDMA */
+ amdgpu_sdma_unset_buffer_funcs_helper(adev);
+ return 0;
}
+ sdma_v5_2_ctx_switch_enable(adev, false);
+ sdma_v5_2_enable(adev, false);
+
return 0;
}