Skip to content

Commit eaa0905

Browse files
Evan Quanalexdeucher
authored andcommitted
drm/amd/pm: keep the BACO feature enabled for suspend
To pair with the workaround which always reset the ASIC in suspend. Otherwise, the reset which relies on BACO will fail. Fixes: daf8de0 ("drm/amdgpu: always reset the asic in suspend (v2)") Signed-off-by: Evan Quan <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Reviewed-by: Guchun Chen <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent ce9b333 commit eaa0905

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,8 +1400,14 @@ static int smu_disable_dpms(struct smu_context *smu)
14001400
{
14011401
struct amdgpu_device *adev = smu->adev;
14021402
int ret = 0;
1403+
/*
1404+
* TODO: (adev->in_suspend && !adev->in_s0ix) is added to pair
1405+
* the workaround which always reset the asic in suspend.
1406+
* It's likely that workaround will be dropped in the future.
1407+
* Then the change here should be dropped together.
1408+
*/
14031409
bool use_baco = !smu->is_apu &&
1404-
((amdgpu_in_reset(adev) &&
1410+
(((amdgpu_in_reset(adev) || (adev->in_suspend && !adev->in_s0ix)) &&
14051411
(amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
14061412
((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));
14071413

0 commit comments

Comments
 (0)