/[packages]/cauldron/kernel/current/SOURCES/Revert-drm-amd-pm-keep-the-BACO-feature-enabled-for-.patch
ViewVC logotype

Contents of /cauldron/kernel/current/SOURCES/Revert-drm-amd-pm-keep-the-BACO-feature-enabled-for-.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1858154 - (show annotations) (download)
Sat May 14 15:23:18 2022 UTC (6 weeks, 4 days ago) by tmb
File size: 1895 byte(s)
- Revert "drm/amd/pm: keep the BACO feature enabled for suspend"


1 From a56f445f807b0276fc0660c330bf93a9ea78e8ea Mon Sep 17 00:00:00 2001
2 From: Alex Deucher <alexander.deucher@amd.com>
3 Date: Tue, 10 May 2022 09:37:06 -0400
4 Subject: [PATCH] Revert "drm/amd/pm: keep the BACO feature enabled for
5 suspend"
6
7 This reverts commit eaa090538e8d21801c6d5f94590c3799e6a528b5.
8
9 Commit ebc002e3ee78 ("drm/amdgpu: don't use BACO for reset in S3")
10 stops using BACO for reset during suspend, so it's no longer
11 necessary to leave BACO enabled during suspend. This fixes
12 resume from suspend on the navy flounder dGPU in the ASUS ROG
13 Strix G513QY.
14
15 Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2008
16 Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1982
17 Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
18 Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
19 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
20 Cc: stable@vger.kernel.org
21 ---
22 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +-------
23 1 file changed, 1 insertion(+), 7 deletions(-)
24
25 diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
26 index f1544755d8b4..f10a0256413e 100644
27 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
28 +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
29 @@ -1351,14 +1351,8 @@ static int smu_disable_dpms(struct smu_context *smu)
30 {
31 struct amdgpu_device *adev = smu->adev;
32 int ret = 0;
33 - /*
34 - * TODO: (adev->in_suspend && !adev->in_s0ix) is added to pair
35 - * the workaround which always reset the asic in suspend.
36 - * It's likely that workaround will be dropped in the future.
37 - * Then the change here should be dropped together.
38 - */
39 bool use_baco = !smu->is_apu &&
40 - (((amdgpu_in_reset(adev) || (adev->in_suspend && !adev->in_s0ix)) &&
41 + ((amdgpu_in_reset(adev) &&
42 (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
43 ((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));
44
45 --
46 2.36.1
47

  ViewVC Help
Powered by ViewVC 1.1.28