From: Mario Limonciello mario.limonciello@amd.com
commit e53d9665ab003df0ece8f869fcd3c2bbbecf7190 upstream.
This codepath should be running in both s0ix and s3, but only does currently because s3 and s0ix are both set in the s0ix case.
Signed-off-by: Mario Limonciello mario.limonciello@amd.com Acked-by: Evan Quan evan.quan@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com Cc: "Limonciello, Mario" Mario.Limonciello@amd.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3939,8 +3939,8 @@ void amdgpu_device_fini_sw(struct amdgpu */ static void amdgpu_device_evict_resources(struct amdgpu_device *adev) { - /* No need to evict vram on APUs for suspend to ram */ - if (adev->in_s3 && (adev->flags & AMD_IS_APU)) + /* No need to evict vram on APUs for suspend to ram or s2idle */ + if ((adev->in_s3 || adev->in_s0ix) && (adev->flags & AMD_IS_APU)) return;
if (amdgpu_ttm_evict_resources(adev, TTM_PL_VRAM))