Revert "drm/amd: Stop evicting resources on APUs in suspend"

Browse source

This reverts commit 3a9626c816.

This breaks S4 because we end up setting the s3/s0ix flags
even when we are entering s4 since prepare is used by both
flows.  The causes both the S3/s0ix and s4 flags to be set
which breaks several checks in the driver which assume they
are mutually exclusive.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3634
Cc: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit ce8f7d9589)
Cc: stable@vger.kernel.org

...

This commit is contained in:

Alex Deucher 2025-05-01 13:00:16 -04:00

parent b7e84fb708

commit d0ce1aaa85

3 changed files with 2 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/amd/amdgpu/amdgpu.h

View file

18

drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

View file

11

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

View file