From: jsg Date: Thu, 19 May 2022 04:09:36 +0000 (+0000) Subject: Revert "drm/amd/pm: keep the BACO feature enabled for suspend" X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=19c7e219dd083aed1d0ab246a0c1a2dbc9fb2969;p=openbsd Revert "drm/amd/pm: keep the BACO feature enabled for suspend" From Alex Deucher 0fad10b263a33492107d62caa460d5e4c717ce29 in linux 5.15.y/5.15.41 a56f445f807b0276fc0660c330bf93a9ea78e8ea in mainline linux --- diff --git a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c index 71476791335..c05ee77ed44 100644 --- a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c +++ b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c @@ -1386,14 +1386,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)));