Skip to content

Commit a56f445

Browse files
committed
Revert "drm/amd/pm: keep the BACO feature enabled for suspend"
This reverts commit eaa0905. Commit ebc002e ("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: Lijo Lazar <[email protected]> Reviewed-by: Mario Limonciello <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent 9b9bd3f commit a56f445

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,14 +1351,8 @@ static int smu_disable_dpms(struct smu_context *smu)
13511351
{
13521352
struct amdgpu_device *adev = smu->adev;
13531353
int ret = 0;
1354-
/*
1355-
* TODO: (adev->in_suspend && !adev->in_s0ix) is added to pair
1356-
* the workaround which always reset the asic in suspend.
1357-
* It's likely that workaround will be dropped in the future.
1358-
* Then the change here should be dropped together.
1359-
*/
13601354
bool use_baco = !smu->is_apu &&
1361-
(((amdgpu_in_reset(adev) || (adev->in_suspend && !adev->in_s0ix)) &&
1355+
((amdgpu_in_reset(adev) &&
13621356
(amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
13631357
((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));
13641358

0 commit comments

Comments
 (0)