drm/amdgpu: Keep SDMAv4.4.2 active during reset

During ASIC wide reset, SDMA shouldn't be clockgated and be ready to
accept freeze requests from PMFW. For that, don't stop SDMA engine
during reset and keep the clocks active.

Signed-off-by: Lijo Lazar <[email protected]>
Reviewed-by: Hawking Zhang <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index 7c91cbd91ac802bd3809d7e72f032cd18f132442..729e26a4a2e74a0f6eca8c2de675f6e4adb84452 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
@@ -566,6 +566,11 @@ static void sdma_v4_4_2_inst_enable(struct amdgpu_device *adev, bool enable,
                sdma_v4_4_2_inst_rlc_stop(adev, inst_mask);
                if (adev->sdma.has_page_queue)
                        sdma_v4_4_2_inst_page_stop(adev, inst_mask);
+
+               /* SDMA FW needs to respond to FREEZE requests during reset.
+                * Keep it running during reset */
+               if (!amdgpu_sriov_vf(adev) && amdgpu_in_reset(adev))
+                       return;
        }
 
        for_each_inst(i, inst_mask) {
@@ -1435,6 +1440,9 @@ static int sdma_v4_4_2_suspend(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+       if (amdgpu_in_reset(adev))
+               sdma_v4_4_2_set_clockgating_state(adev, AMD_CG_STATE_UNGATE);
+
        return sdma_v4_4_2_hw_fini(adev);
 }