[PATCH] drm/amd: Drop calls to restore power limit and clock from smu_resume()

[PATCH] drm/amd: Drop calls to restore power limit and clock from smu_resume()

[Alex Deucher]

From: Mario Limonciello <mario.limonciello@amd.com>

User requested power limits and clock settings are already restored as
part of smu_restore_dpm_user_profile(). It's unnecessary to call the
same restore as part of smu_resume().

Revert the following commits to drop that extra restore:
commit ed4efe426a49 ("drm/amd: Restore cached power limit during resume")
commit 796ff8a7e01b ("drm/amd: Restore cached manual clock settings during resume")
commit f9b80514a722 ("drm/amd: Only restore cached manual clock settings in restore if OD enabled")

Suggested-by: Lijo Lazar <Lijo.Lazar@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 4b6ec94fdae2407d9b8e69e3ec5f879e72ad667e)
Closes: https://gitlab.freedesktop.org/drm/amd/-/work_items/5634
Cc: stable@vger.kernel.org # 6.18.x
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 53d071eddbf4..8473eaac1e7f 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -2234,7 +2234,6 @@ 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;
@@ -2266,18 +2265,6 @@ 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;
-	}
-
-	if (smu_dpm_ctx->dpm_level == AMD_DPM_FORCED_LEVEL_MANUAL && smu->od_enabled) {
-		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;
-- 
2.55.0

Re: [PATCH] drm/amd: Drop calls to restore power limit and clock from smu_resume()

[Greg KH]

On Tue, Sep 08, 2026 at 09:54:07AM -0400, Alex Deucher wrote:
> From: Mario Limonciello <mario.limonciello@amd.com>
> 
> User requested power limits and clock settings are already restored as
> part of smu_restore_dpm_user_profile(). It's unnecessary to call the
> same restore as part of smu_resume().
> 
> Revert the following commits to drop that extra restore:
> commit ed4efe426a49 ("drm/amd: Restore cached power limit during resume")
> commit 796ff8a7e01b ("drm/amd: Restore cached manual clock settings during resume")
> commit f9b80514a722 ("drm/amd: Only restore cached manual clock settings in restore if OD enabled")
> 
> Suggested-by: Lijo Lazar <Lijo.Lazar@amd.com>
> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> (cherry picked from commit 4b6ec94fdae2407d9b8e69e3ec5f879e72ad667e)

What stable tree(s) is this backport for?

thanks,

greg k-h