Restore cached power limit and custom clocks
Subsystems (3)
cover Restore cached power limit and custom clocks
From: Mario Limonciello <[email protected]>
If userspace has programmed a custom power limit and/or custom clock table the state will not be maintained across an S3 suspend cycle.
The values are already cached, so restore them in the resume sequence.
Mario Limonciello (2):
drm/amd: Restore cached power limit during resume drm/amd: Restore cached manual clock settings during resume
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Signature · 1 line
2.43.0
PATCH 1/2 drm/amd: Restore cached power limit during resume
From: Mario Limonciello <[email protected]>
The power limit will be cached in smu->current_power_limit but if the ASIC goes into S3 this value won't be restored.
Restore the value during SMU resume.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +6 -0
@@ -2175,6 +2175,12 @@ static int smu_resume(struct amdgpu_ip_block *ip_block) adev->pm.dpm_enabled = true; +if (smu->current_power_limit) { + ret =smu_set_power_limit (smu, smu->current_power_limit); +if (ret && ret != -EOPNOTSUPP ) +return ret; + } +dev_info (adev->dev,"SMU is resumed successfully!\n" );return 0 ;
Signature · 1 line
2.43.0
Re: [PATCH 1/2] drm/amd: Restore cached power limit during resume
Series is:
Quoted 33 lines · Mario Limonciello
From: Mario Limonciello <[email protected]>
The power limit will be cached in
smu->current_power_limitbut if the ASIC goes into S3 this value won't be restored.Restore the value during SMU resume.
Signed-off-by Mario Limonciello <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +6
-1@@ -2175,6 +2175,12 @@ static int smu_resume(struct amdgpu_ip_block *ip_block) adev->pm.dpm_enabled = true; +if (smu->current_power_limit) { + ret =smu_set_power_limit (smu, smu->current_power_limit); +if (ret && ret != -EOPNOTSUPP ) +return ret; + } +dev_info (adev->dev,"SMU is resumed successfully!\n" );return 0 ; --2.43.0
PATCH 2/2 drm/amd: Restore cached manual clock settings during resume
In reply to Mario LimoncielloFrom: Mario Limonciello <[email protected]>
If the SCLK limits have been set before S3 they will not be restored. The limits are however cached in the driver and so they can be restored by running a commit sequence during resume.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +10 -0
@@ -76,6 +76,9 @@ static void smu_power_profile_mode_get(struct smu_context *smu, enum PP_SMC_POWER_PROFILE profile_mode);static void smu_power_profile_mode_put (struct smu_context *smu,enum PP_SMC_POWER_PROFILE profile_mode); +static int smu_od_edit_dpm_table (void *handle, +enum PP_OD_DPM_TABLE_COMMAND type, +long *input,uint32_t size);static int smu_sys_get_pp_feature_mask (void *handle,char *buf)
@@ -2144,6 +2147,7 @@ static int smu_resume(struct amdgpu_ip_block *ip_block)int ret;struct amdgpu_device *adev = ip_block->adev;struct smu_context *smu = adev->powerplay.pp_handle; +struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);if (amdgpu_sriov_multi_vf_mode (adev))return 0 ;
@@ -2181,6 +2185,12 @@ static int smu_resume(struct amdgpu_ip_block *ip_block)return ret; } +if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { + ret =smu_od_edit_dpm_table (smu,PP_OD_COMMIT_DPM_TABLE ,NULL ,0 ); +if (ret) +return ret; + } +dev_info (adev->dev,"SMU is resumed successfully!\n" );return 0 ;
Signature · 1 line
2.43.0