drm/amd/pm: update pcie dpm parameters before smu feature enablement

update pcie dpm parameters before smu feature enablement

Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
Reviewed-by: Yang Wang <kevinyang.wang@amd.com>
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 aedb209c75dacb6e263621545ffcae383c9df3fd..824fcc6dd32a8f6becdf3d3f7c9a43252dced525 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1687,26 +1687,6 @@ static int smu_smc_hw_setup(struct smu_context *smu)
                }
        }
 
-       ret = smu_system_features_control(smu, true);
-       if (ret) {
-               dev_err(adev->dev, "Failed to enable requested dpm features!\n");
-               return ret;
-       }
-
-       smu_init_xgmi_plpd_mode(smu);
-
-       ret = smu_feature_get_enabled_mask(smu, &features_supported);
-       if (ret) {
-               dev_err(adev->dev, "Failed to retrieve supported dpm features!\n");
-               return ret;
-       }
-       bitmap_copy(feature->supported,
-                   (unsigned long *)&features_supported,
-                   feature->feature_num);
-
-       if (!smu_is_dpm_running(smu))
-               dev_info(adev->dev, "dpm has been disabled\n");
-
        /*
         * Set initialized values (get from vbios) to dpm tables context such as
         * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
@@ -1753,6 +1733,26 @@ static int smu_smc_hw_setup(struct smu_context *smu)
                return ret;
        }
 
+       ret = smu_system_features_control(smu, true);
+       if (ret) {
+               dev_err(adev->dev, "Failed to enable requested dpm features!\n");
+               return ret;
+       }
+
+       smu_init_xgmi_plpd_mode(smu);
+
+       ret = smu_feature_get_enabled_mask(smu, &features_supported);
+       if (ret) {
+               dev_err(adev->dev, "Failed to retrieve supported dpm features!\n");
+               return ret;
+       }
+       bitmap_copy(feature->supported,
+                   (unsigned long *)&features_supported,
+                   feature->feature_num);
+
+       if (!smu_is_dpm_running(smu))
+               dev_info(adev->dev, "dpm has been disabled\n");
+
        ret = smu_get_thermal_temperature_range(smu);
        if (ret) {
                dev_err(adev->dev, "Failed to get thermal temperature ranges!\n");