On Thu, 30 Oct 2025 at 16:37, Mario Limonciello
<[email protected]> wrote:
>
>
>
> On 10/24/2025 12:14 PM, Antheas Kapenekakis wrote:
> > On Fri, 24 Oct 2025 at 19:08, Alex Deucher <[email protected]>
> > wrote:
> >>
> >> 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
> >> Signed-off-by: Alex Deucher <[email protected]>
> >> ---
> >> drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 ++++++
> >> drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 3 +++
> >> 2 files changed, 9 insertions(+)
> >
> > Sleep failed on the Deck the same way as Mario's attempt
>
> Can you please test patch 2/2 from this series and patch 1/5 from this one:
>
> https://lore.kernel.org/amd-gfx/[email protected]/
>
> I expect that everything GPU wise works with those 2 combined, can you
> confirm?
I will update you tomorrow. Currently traveling.
Antheas
> >
> >> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> >> b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> >> index 10d42267085b0..5bee02f0ba867 100644
> >> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> >> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> >> @@ -2054,6 +2054,12 @@ static int smu_disable_dpms(struct smu_context *smu)
> >> smu->is_apu && (amdgpu_in_reset(adev) || adev->in_s0ix))
> >> return 0;
> >>
> >> + /* vangogh s0ix */
> >> + if ((amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(11, 5, 0)
> >> ||
> >> + amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(11, 5, 2))
> >> &&
> >> + adev->in_s0ix)
> >> + return 0;
> >> +
> >> /*
> >> * For gpu reset, runpm and hibernation through BACO,
> >> * BACO feature has to be kept enabled.
> >> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> >> b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> >> index 53579208cffb4..9626da2dba584 100644
> >> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> >> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
> >> @@ -2219,6 +2219,9 @@ static int vangogh_post_smu_init(struct smu_context
> >> *smu)
> >> uint32_t total_cu = adev->gfx.config.max_cu_per_sh *
> >> adev->gfx.config.max_sh_per_se *
> >> adev->gfx.config.max_shader_engines;
> >>
> >> + if (adev->in_s0ix)
> >> + return 0;
> >> +
> >> /* allow message will be sent after enable message on Vangogh*/
> >> if (smu_cmn_feature_is_enabled(smu, SMU_FEATURE_DPM_GFXCLK_BIT) &&
> >> (adev->pg_flags & AMD_PG_SUPPORT_GFX_PG)) {
> >> --
> >> 2.51.0
> >>
> >>
> >
> >
>
>
