diff options
author | Mario Limonciello <mario.limonciello@amd.com> | 2023-11-09 11:23:46 -0600 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2023-11-10 11:08:20 -0500 |
commit | e4c44b1a19625348fc004ce8c5f828d5d80d037e (patch) | |
tree | 08588e0688af125e7afd44c47f0ea5f8b94d321d | |
parent | 197264284303b30b26e885d83680f594e69840e5 (diff) | |
download | linux-stable-e4c44b1a19625348fc004ce8c5f828d5d80d037e.tar.gz linux-stable-e4c44b1a19625348fc004ce8c5f828d5d80d037e.tar.bz2 linux-stable-e4c44b1a19625348fc004ce8c5f828d5d80d037e.zip |
drm/amd: Explicitly check for GFXOFF to be enabled for s0ix
If a user has disabled GFXOFF this may cause problems for the suspend
sequence. Ensure that it is enabled in amdgpu_acpi_is_s0ix_active().
The system won't reach the deepest state but it also won't hang.
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c index d62e49758635..e550067e5c5d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c @@ -1497,6 +1497,9 @@ bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) if (adev->asic_type < CHIP_RAVEN) return false; + if (!(adev->pm.pp_feature & PP_GFXOFF_MASK)) + return false; + /* * If ACPI_FADT_LOW_POWER_S0 is not set in the FADT, it is generally * risky to do any special firmware-related preparations for entering |