Commit 0eb73fee authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amd/pm: keep the BACO feature enabled for suspend" 

This reverts commit eaa09053.

Commit ebc002e3 ("drm/amdgpu: don't use BACO for reset in S3")
stops using BACO for reset during suspend, so it's no longer
necessary to leave BACO enabled during suspend.  This fixes
resume from suspend on the navy flounder dGPU in the ASUS ROG
Strix G513QY.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2008
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1982


Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5be32356

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

+1 −7
Original line number Diff line number Diff line
@@ -1390,14 +1390,8 @@ static int smu_disable_dpms(struct smu_context *smu) 
{

	struct amdgpu_device *adev = smu->adev;

	int ret = 0;

	/*

	 * TODO: (adev->in_suspend && !adev->in_s0ix) is added to pair

	 * the workaround which always reset the asic in suspend.

	 * It's likely that workaround will be dropped in the future.

	 * Then the change here should be dropped together.

	 */

	bool use_baco = !smu->is_apu &&

		(((amdgpu_in_reset(adev) || (adev->in_suspend && !adev->in_s0ix)) &&

		((amdgpu_in_reset(adev) &&

		  (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||

		 ((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));