Commit 4021229e authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend 



The SMU expects CGPG to be enabled when entering S0ix.
with this we can re-enable SMU suspend.

Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9adb125d

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

+1 −2
Original line number Diff line number Diff line
@@ -2739,8 +2739,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) 


		/* XXX fix these remaining cases */

		if (adev->in_s0ix &&

		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC || /* breaks suspend */

		     adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP || /* breaks resume */

		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP || /* breaks resume */

		     adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX))  /* breaks suspend */

			continue;

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+2 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,8 @@ static int smu_suspend(void *handle) 


	smu->watermarks_bitmap &= ~(WATERMARKS_LOADED);



	if (smu->is_apu)

	/* skip CGPG when in S0ix */

	if (smu->is_apu && !adev->in_s0ix)

		smu_set_gfx_cgpg(&adev->smu, false);



	return 0;