Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+13 −4
Original line number Diff line number Diff line
@@ -1336,15 +1336,24 @@ 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 */

		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);

		/* XXX handle errors */