[PATCH 39/52] drm/amdgpu: ungate SMC clockgating first before suspend

[Alex Deucher]

From: Flora Cui <flora....@amd.com>

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 at amd.com>
Reviewed-by: Eric Huang <JinHuiEric.Huang at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 5ed7baf..e0c2e99 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1340,14 +1340,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);
-- 
2.5.0