Commit c5a93a28 authored by Flora Cui's avatar Flora Cui Committed by Alex Deucher

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: default avatarFlora Cui <Flora.Cui@amd.com>
Reviewed-by: default avatarEric Huang <JinHuiEric.Huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f4bfffdd
...@@ -1336,14 +1336,23 @@ static int amdgpu_suspend(struct amdgpu_device *adev) ...@@ -1336,14 +1336,23 @@ static int amdgpu_suspend(struct amdgpu_device *adev)
{ {
int i, r; 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--) { for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
if (!adev->ip_block_status[i].valid) if (!adev->ip_block_status[i].valid)
continue; continue;
/* ungate blocks so that suspend can properly shut them down */ /* ungate blocks so that suspend can properly shut them down */
r = adev->ip_blocks[i].funcs->set_clockgating_state((void *)adev, if (i != AMD_IP_BLOCK_TYPE_SMC) {
AMD_CG_STATE_UNGATE); r = adev->ip_blocks[i].funcs->set_clockgating_state((void *)adev,
if (r) { AMD_CG_STATE_UNGATE);
DRM_ERROR("set_clockgating_state(ungate) %d failed %d\n", i, r); if (r) {
DRM_ERROR("set_clockgating_state(ungate) %d failed %d\n", i, r);
}
} }
/* XXX handle errors */ /* XXX handle errors */
r = adev->ip_blocks[i].funcs->suspend(adev); r = adev->ip_blocks[i].funcs->suspend(adev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment