Skip to content

Commit 7c5609b

Browse files
committed
drm/amdgpu/smu: Handle S0ix for vangogh
Fix the flows for S0ix. There is no need to stop rlc or reintialize PMFW in S0ix. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4659 Reviewed-by: Mario Limonciello <mario.limonciello@amd.com> Reported-by: Antheas Kapenekakis <lkml@antheas.dev> Tested-by: Antheas Kapenekakis <lkml@antheas.dev> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit fd39b5a5830d8f2553e0c09d4d50bdff28b10080) Cc: <stable@vger.kernel.org> # c81f5ce: drm/amdgpu: Drop PMFW RLC notifier from amdgpu_device_suspend() Cc: <stable@vger.kernel.org>
1 parent c81f5ce commit 7c5609b

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,6 +2040,12 @@ static int smu_disable_dpms(struct smu_context *smu)
20402040
smu->is_apu && (amdgpu_in_reset(adev) || adev->in_s0ix))
20412041
return 0;
20422042

2043+
/* vangogh s0ix */
2044+
if ((amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(11, 5, 0) ||
2045+
amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(11, 5, 2)) &&
2046+
adev->in_s0ix)
2047+
return 0;
2048+
20432049
/*
20442050
* For gpu reset, runpm and hibernation through BACO,
20452051
* BACO feature has to be kept enabled.

drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,6 +2217,9 @@ static int vangogh_post_smu_init(struct smu_context *smu)
22172217
uint32_t total_cu = adev->gfx.config.max_cu_per_sh *
22182218
adev->gfx.config.max_sh_per_se * adev->gfx.config.max_shader_engines;
22192219

2220+
if (adev->in_s0ix)
2221+
return 0;
2222+
22202223
/* allow message will be sent after enable message on Vangogh*/
22212224
if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_GFXCLK_BIT) &&
22222225
(adev->pg_flags & AMD_PG_SUPPORT_GFX_PG)) {

0 commit comments

Comments
 (0)