drm/amdgpu: ungate SMC clockgating first before suspend

46c34bcb6a15dd85329a39a5e72c62108626acdc put all block’s clockgating
support in SMC. The sequence in suspend routine should be adjusted
accordingly, otherwise it causes asic hang.

Signed-off-by: Flora Cui <Flora.Cui@amd.com>
Reviewed-by: Eric Huang <JinHuiEric.Huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 077d4cc51a8c5ffd4fb26c757fb0299dfedd0b57..ebcb0835d52a5166707ff08fd11c3634a0c200e9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1336,14 +1336,23 @@ static int amdgpu_suspend(struct amdgpu_device *adev)
 {
        int i, r;
 
+       /* ungate SMC block first */
+       r = amdgpu_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_SMC,
+                                        AMD_CG_STATE_UNGATE);
+       if (r) {
+               DRM_ERROR("set_clockgating_state(ungate) SMC failed %d\n",r);
+       }
+
        for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
                if (!adev->ip_block_status[i].valid)
                        continue;
                /* ungate blocks so that suspend can properly shut them down */
-               r = adev->ip_blocks[i].funcs->set_clockgating_state((void *)adev,
-                                                                   AMD_CG_STATE_UNGATE);
-               if (r) {
-                       DRM_ERROR("set_clockgating_state(ungate) %d failed %d\n", i, r);
+               if (i != AMD_IP_BLOCK_TYPE_SMC) {
+                       r = adev->ip_blocks[i].funcs->set_clockgating_state((void *)adev,
+                                                                           AMD_CG_STATE_UNGATE);
+                       if (r) {
+                               DRM_ERROR("set_clockgating_state(ungate) %d failed %d\n", i, r);
+                       }
                }
                /* XXX handle errors */
                r = adev->ip_blocks[i].funcs->suspend(adev);