Commit 557f42a2 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: re-enable suspend phase 2 for S0ix 



This really needs to be done to properly tear down
the device.  SMC, PSP, and GFX are still problematic,
need to dig deeper into what aspect of them that is
problematic.

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

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

+9 −3
Original line number Diff line number Diff line
@@ -2728,10 +2728,8 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) 
{

	int i, r;



	if (adev->in_s0ix) {

	if (adev->in_s0ix)

		amdgpu_gfx_state_change_set(adev, sGpuChangeState_D3Entry);

		return 0;

	}



	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {

		if (!adev->ip_blocks[i].status.valid)
@@ -2755,6 +2753,14 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) 
			adev->ip_blocks[i].status.hw = false;

			continue;

		}



		/* 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_GFX))  /* breaks suspend */

			continue;



		/* XXX handle errors */

		r = adev->ip_blocks[i].version->funcs->suspend(adev);

		/* XXX handle errors */