Commit 4a700546 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: put SMU into proper state on runpm suspending for BOCO capable platform 



By setting mp1_state as PP_MP1_STATE_UNLOAD, MP1 will do some proper cleanups and
put itself into a state ready for PNP. That can workaround some random resuming
failure observed on BOCO capable platforms.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0726ed30

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

+15 −0
Original line number Diff line number Diff line
@@ -2251,12 +2251,27 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev) 
	if (amdgpu_device_supports_px(drm_dev))

		drm_dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;



	/*

	 * By setting mp1_state as PP_MP1_STATE_UNLOAD, MP1 will do some

	 * proper cleanups and put itself into a state ready for PNP. That

	 * can address some random resuming failure observed on BOCO capable

	 * platforms.

	 * TODO: this may be also needed for PX capable platform.

	 */

	if (amdgpu_device_supports_boco(drm_dev))

		adev->mp1_state = PP_MP1_STATE_UNLOAD;



	ret = amdgpu_device_suspend(drm_dev, false);

	if (ret) {

		adev->in_runpm = false;

		if (amdgpu_device_supports_boco(drm_dev))

			adev->mp1_state = PP_MP1_STATE_NONE;

		return ret;

	}



	if (amdgpu_device_supports_boco(drm_dev))

		adev->mp1_state = PP_MP1_STATE_NONE;



	if (amdgpu_device_supports_px(drm_dev)) {

		/* Only need to handle PCI state in the driver for ATPX

		 * PCI core handles it for _PR3.