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>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 4317da6f7c389d4eea4b8e59516e801aec5ecaf0..b3510345a32ad5ccada8785a967f2c4b73877b8e 100644 (file)
--- 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 53579208cffb48d8348b5b798ec1d239c40a3023..9626da2dba584ab7745b04db5b5535421830b09d 100644 (file)
--- 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)) {