Skip to content

Commit 6519650

Browse files
alexdeuchergregkh
authored andcommitted
drm/amdgpu/smu: Handle S0ix for vangogh
commit 7c5609b upstream. 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 <[email protected]> Reported-by: Antheas Kapenekakis <[email protected]> Tested-by: Antheas Kapenekakis <[email protected]> Signed-off-by: Alex Deucher <[email protected]> (cherry picked from commit fd39b5a5830d8f2553e0c09d4d50bdff28b10080) Cc: <[email protected]> # c81f5ce: drm/amdgpu: Drop PMFW RLC notifier from amdgpu_device_suspend() Cc: <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 065bd62 commit 6519650

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
@@ -1942,6 +1942,12 @@ static int smu_disable_dpms(struct smu_context *smu)
19421942
smu->is_apu && (amdgpu_in_reset(adev) || adev->in_s0ix))
19431943
return 0;
19441944

1945+
/* vangogh s0ix */
1946+
if ((amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(11, 5, 0) ||
1947+
amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(11, 5, 2)) &&
1948+
adev->in_s0ix)
1949+
return 0;
1950+
19451951
/*
19461952
* For gpu reset, runpm and hibernation through BACO,
19471953
* 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
@@ -2214,6 +2214,9 @@ static int vangogh_post_smu_init(struct smu_context *smu)
22142214
uint32_t total_cu = adev->gfx.config.max_cu_per_sh *
22152215
adev->gfx.config.max_sh_per_se * adev->gfx.config.max_shader_engines;
22162216

2217+
if (adev->in_s0ix)
2218+
return 0;
2219+
22172220
/* allow message will be sent after enable message on Vangogh*/
22182221
if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_GFXCLK_BIT) &&
22192222
(adev->pg_flags & AMD_PG_SUPPORT_GFX_PG)) {

0 commit comments

Comments
 (0)