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>

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 7b4195f18a7ca79595cf21764e6b54722c165d5f..298fa11702e755875aa093f8bb60985afa6bb360 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1940,8 +1940,11 @@ static int sdma_v4_0_hw_fini(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        int i;
 
-       if (amdgpu_sriov_vf(adev))
+       if (amdgpu_sriov_vf(adev)) {
+               /* disable the scheduler for SDMA */
+               amdgpu_sdma_unset_buffer_funcs_helper(adev);
                return 0;
+       }
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                amdgpu_irq_put(adev, &adev->sdma.ecc_irq,

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index 783048e1b0cea68aa5b791ae77ccd0db32e9d089..d4d9f196db834e1ee69c74f2c66a451fbf5deef4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1456,8 +1456,11 @@ static int sdma_v5_0_hw_fini(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-       if (amdgpu_sriov_vf(adev))
+       if (amdgpu_sriov_vf(adev)) {
+               /* disable the scheduler for SDMA */
+               amdgpu_sdma_unset_buffer_funcs_helper(adev);
                return 0;
+       }
 
        sdma_v5_0_ctx_switch_enable(adev, false);
        sdma_v5_0_enable(adev, false);

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index c2ee53c2dd1b018e7a49bcf84bb0e9ec3d829890..809eca54fc617f2c7ac5057495e2fbc046d0be53 100644 (file)
--- 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;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index a6483483404e531a93f2dc8b14447929bc3b4460..da3beb0bf2fa2e0c040064e9446248b5bd387b62 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -1311,8 +1311,11 @@ static int sdma_v6_0_hw_fini(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
-       if (amdgpu_sriov_vf(adev))
+       if (amdgpu_sriov_vf(adev)) {
+               /* disable the scheduler for SDMA */
+               amdgpu_sdma_unset_buffer_funcs_helper(adev);
                return 0;
+       }
 
        sdma_v6_0_ctx_switch_enable(adev, false);
        sdma_v6_0_enable(adev, false);