drm/amd/pm/swsmu: clean up user profile function

[ Upstream commit d8cce9306801cfbf709055677f7896905094ff95 ]

Remove unnecessary comments, enable restore mode using
'|=' operator, fixes the alignment to improve the code
readability.

v2: Move all restoration flag check to bitwise '&' operator

Signed-off-by: Arunpravin <Arunpravin.PaneerSelvam@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index cd905e41080e5332c8c7b638c397dbef3b928ff2..42c4dbe3e3624f9ff1265ecd0060cdf39b67a86e 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -279,35 +279,25 @@ static void smu_set_user_clk_dependencies(struct smu_context *smu, enum smu_clk_
        if (smu->adev->in_suspend)
                return;
 
-       /*
-        * mclk, fclk and socclk are interdependent
-        * on each other
-        */
        if (clk == SMU_MCLK) {
-               /* reset clock dependency */
                smu->user_dpm_profile.clk_dependency = 0;
-               /* set mclk dependent clocks(fclk and socclk) */
                smu->user_dpm_profile.clk_dependency = BIT(SMU_FCLK) | BIT(SMU_SOCCLK);
        } else if (clk == SMU_FCLK) {
-               /* give priority to mclk, if mclk dependent clocks are set */
+               /* MCLK takes precedence over FCLK */
                if (smu->user_dpm_profile.clk_dependency == (BIT(SMU_FCLK) | BIT(SMU_SOCCLK)))
                        return;
 
-               /* reset clock dependency */
                smu->user_dpm_profile.clk_dependency = 0;
-               /* set fclk dependent clocks(mclk and socclk) */
                smu->user_dpm_profile.clk_dependency = BIT(SMU_MCLK) | BIT(SMU_SOCCLK);
        } else if (clk == SMU_SOCCLK) {
-               /* give priority to mclk, if mclk dependent clocks are set */
+               /* MCLK takes precedence over SOCCLK */
                if (smu->user_dpm_profile.clk_dependency == (BIT(SMU_FCLK) | BIT(SMU_SOCCLK)))
                        return;
 
-               /* reset clock dependency */
                smu->user_dpm_profile.clk_dependency = 0;
-               /* set socclk dependent clocks(mclk and fclk) */
                smu->user_dpm_profile.clk_dependency = BIT(SMU_MCLK) | BIT(SMU_FCLK);
        } else
-               /* add clk dependencies here, if any */
+               /* Add clk dependencies here, if any */
                return;
 }
 
@@ -331,7 +321,7 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu)
                return;
 
        /* Enable restore flag */
-       smu->user_dpm_profile.flags = SMU_DPM_USER_PROFILE_RESTORE;
+       smu->user_dpm_profile.flags |= SMU_DPM_USER_PROFILE_RESTORE;
 
        /* set the user dpm power limit */
        if (smu->user_dpm_profile.power_limit) {
@@ -354,8 +344,8 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu)
                                ret = smu_force_clk_levels(smu, clk_type,
                                                smu->user_dpm_profile.clk_mask[clk_type]);
                                if (ret)
-                                       dev_err(smu->adev->dev, "Failed to set clock type = %d\n",
-                                                       clk_type);
+                                       dev_err(smu->adev->dev,
+                                               "Failed to set clock type = %d\n", clk_type);
                        }
                }
        }
@@ -1777,7 +1767,7 @@ int smu_force_clk_levels(struct smu_context *smu,
 
        if (smu->ppt_funcs && smu->ppt_funcs->force_clk_levels) {
                ret = smu->ppt_funcs->force_clk_levels(smu, clk_type, mask);
-               if (!ret && smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE) {
+               if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE)) {
                        smu->user_dpm_profile.clk_mask[clk_type] = mask;
                        smu_set_user_clk_dependencies(smu, clk_type);
                }
@@ -2034,7 +2024,7 @@ int smu_set_fan_speed_rpm(struct smu_context *smu, uint32_t speed)
        if (smu->ppt_funcs->set_fan_speed_percent) {
                percent = speed * 100 / smu->fan_max_rpm;
                ret = smu->ppt_funcs->set_fan_speed_percent(smu, percent);
-               if (!ret && smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE)
+               if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
                        smu->user_dpm_profile.fan_speed_percent = percent;
        }
 
@@ -2104,7 +2094,7 @@ int smu_set_power_limit(struct smu_context *smu, uint32_t limit)
 
        if (smu->ppt_funcs->set_power_limit) {
                ret = smu->ppt_funcs->set_power_limit(smu, limit);
-               if (!ret && smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE)
+               if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
                        smu->user_dpm_profile.power_limit = limit;
        }
 
@@ -2285,7 +2275,7 @@ int smu_set_fan_control_mode(struct smu_context *smu, int value)
 
        if (smu->ppt_funcs->set_fan_control_mode) {
                ret = smu->ppt_funcs->set_fan_control_mode(smu, value);
-               if (!ret && smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE)
+               if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
                        smu->user_dpm_profile.fan_mode = value;
        }
 
@@ -2293,7 +2283,7 @@ int smu_set_fan_control_mode(struct smu_context *smu, int value)
 
        /* reset user dpm fan speed */
        if (!ret && value != AMD_FAN_CTRL_MANUAL &&
-                       smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE)
+                       !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
                smu->user_dpm_profile.fan_speed_percent = 0;
 
        return ret;
@@ -2335,7 +2325,7 @@ int smu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)
                if (speed > 100)
                        speed = 100;
                ret = smu->ppt_funcs->set_fan_speed_percent(smu, speed);
-               if (!ret && smu->user_dpm_profile.flags != SMU_DPM_USER_PROFILE_RESTORE)
+               if (!ret && !(smu->user_dpm_profile.flags & SMU_DPM_USER_PROFILE_RESTORE))
                        smu->user_dpm_profile.fan_speed_percent = speed;
        }