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

drm/amdgpu: fix shutdown and poweroff process failed with s0ix 

In the shutdown and poweroff opt on the s0i3 system we still need
un-gate the gfx clock gating and power gating before destory amdgpu device.

Fixes: 628c36d7 ("drm/amdgpu: update amdgpu device suspend/resume sequence for s0i3 support")
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1499


Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarPrike Liang <Prike.Liang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 83e6667b

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+6 −0
Original line number Diff line number Diff line
@@ -1008,6 +1008,12 @@ struct amdgpu_device { 
	bool                            in_suspend;

	bool				in_hibernate;



	/*

	 * The combination flag in_poweroff_reboot_com used to identify the poweroff

	 * and reboot opt in the s0i3 system-wide suspend.

	 */

	bool 				in_poweroff_reboot_com;



	atomic_t 			in_gpu_reset;

	enum pp_mp1_state               mp1_state;

	struct rw_semaphore reset_sem;

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

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

	int i, r;



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

	if (adev->in_poweroff_reboot_com ||

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

	}
@@ -3741,7 +3742,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 


	amdgpu_fence_driver_suspend(adev);



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

	if (adev->in_poweroff_reboot_com ||

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

		r = amdgpu_device_ip_suspend_phase2(adev);

	else

		amdgpu_gfx_state_change_set(adev, sGpuChangeState_D3Entry);

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

+8 −1
Original line number Diff line number Diff line
@@ -1270,7 +1270,9 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) 
	 */

	if (!amdgpu_passthrough(adev))

		adev->mp1_state = PP_MP1_STATE_UNLOAD;

	adev->in_poweroff_reboot_com = true;

	amdgpu_device_ip_suspend(adev);

	adev->in_poweroff_reboot_com = false;

	adev->mp1_state = PP_MP1_STATE_NONE;

}
@@ -1312,8 +1314,13 @@ static int amdgpu_pmops_thaw(struct device *dev) 
static int amdgpu_pmops_poweroff(struct device *dev)

{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);

	int r;



	return amdgpu_device_suspend(drm_dev, true);

	adev->in_poweroff_reboot_com = true;

	r =  amdgpu_device_suspend(drm_dev, true);

	adev->in_poweroff_reboot_com = false;

	return r;

}



static int amdgpu_pmops_restore(struct device *dev)