Commit 9aa26019 authored by Prike Liang's avatar Prike Liang Committed by Alex Deucher
Browse files

drm/amdgpu: fix the hibernation suspend with s0ix 



During system hibernation suspend still need un-gate gfx CG/PG firstly to handle HW
status check before HW resource destory.

Signed-off-by: default avatarPrike Liang <Prike.Liang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent d27ce83f

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

+6 −2
Original line number Diff line number Diff line
@@ -2678,7 +2678,7 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) 
{

	int i, r;



	if (adev->in_poweroff_reboot_com ||

	if (adev->in_poweroff_reboot_com || adev->in_hibernate ||

	    !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) {

		amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);

		amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);
@@ -3742,7 +3742,11 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 


	amdgpu_fence_driver_suspend(adev);



	if (adev->in_poweroff_reboot_com ||

	/*

	 * TODO: Need figure out the each GNB IP idle off dependency and then

	 * improve the AMDGPU suspend/resume sequence for system-wide Sx entry/exit.

	 */

	if (adev->in_poweroff_reboot_com || adev->in_hibernate ||

	    !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev))

		r = amdgpu_device_ip_suspend_phase2(adev);

	else