drm/amdgpu/swsmu: always force a state reprogram on init

From Alex Deucher
39defab0ebf0872b7a84deafbe903c8e30da7748 in linux-6.6.y/6.6.49
d420c857d85777663e8d16adfc24463f5d5c2dbc in mainline linux

diff --git a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c
index fafffbe..ab7f5a2 100644 (file)
--- a/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/sys/dev/pci/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1841,8 +1841,9 @@ static int smu_bump_power_profile_mode(struct smu_context *smu,
 }
 
 static int smu_adjust_power_state_dynamic(struct smu_context *smu,
-                                  enum amd_dpm_forced_level level,
-                                  bool skip_display_settings)
+                                         enum amd_dpm_forced_level level,
+                                         bool skip_display_settings,
+                                         bool force_update)
 {
        int ret = 0;
        int index = 0;
@@ -1871,7 +1872,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu,
                }
        }
 
-       if (smu_dpm_ctx->dpm_level != level) {
+       if (force_update || smu_dpm_ctx->dpm_level != level) {
                ret = smu_asic_set_performance_level(smu, level);
                if (ret) {
                        dev_err(smu->adev->dev, "Failed to set performance level!");
@@ -1887,7 +1888,7 @@ static int smu_adjust_power_state_dynamic(struct smu_context *smu,
                index = index > 0 && index <= WORKLOAD_POLICY_MAX ? index - 1 : 0;
                workload[0] = smu->workload_setting[index];
 
-               if (smu->power_profile_mode != workload[0])
+               if (force_update || smu->power_profile_mode != workload[0])
                        smu_bump_power_profile_mode(smu, workload, 0);
        }
 
@@ -1908,11 +1909,13 @@ static int smu_handle_task(struct smu_context *smu,
                ret = smu_pre_display_config_changed(smu);
                if (ret)
                        return ret;
-               ret = smu_adjust_power_state_dynamic(smu, level, false);
+               ret = smu_adjust_power_state_dynamic(smu, level, false, false);
                break;
        case AMD_PP_TASK_COMPLETE_INIT:
+               ret = smu_adjust_power_state_dynamic(smu, level, true, true);
+               break;
        case AMD_PP_TASK_READJUST_POWER_STATE:
-               ret = smu_adjust_power_state_dynamic(smu, level, true);
+               ret = smu_adjust_power_state_dynamic(smu, level, true, false);
                break;
        default:
                break;