drm/amdgpu/smu13: always apply the powersave optimization

It can avoid margin issues in some very demanding applications.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3618
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3131
Fixes: c50fe289ed72 ("drm/amdgpu/swsmu: always force a state reprogram on init")
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 62f38b4ccaa6aa063ca781d80b10aacd39dc5c76)
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index 1d024b122b0c02a94a44b82faf248a38448a1809..cb923e33fd6fc742ad23ef94ba4e1eeabdc062b5 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -2555,18 +2555,16 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
        workload_mask = 1 << workload_type;
 
        /* Add optimizations for SMU13.0.0/10.  Reuse the power saving profile */
-       if (smu->power_profile_mode == PP_SMC_POWER_PROFILE_COMPUTE) {
-               if ((amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 0) &&
-                       ((smu->adev->pm.fw_version == 0x004e6601) ||
-                       (smu->adev->pm.fw_version >= 0x004e7300))) ||
-                       (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 10) &&
-                        smu->adev->pm.fw_version >= 0x00504500)) {
-                       workload_type = smu_cmn_to_asic_specific_index(smu,
-                                                               CMN2ASIC_MAPPING_WORKLOAD,
-                                                               PP_SMC_POWER_PROFILE_POWERSAVING);
-                       if (workload_type >= 0)
-                               workload_mask |= 1 << workload_type;
-               }
+       if ((amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 0) &&
+            ((smu->adev->pm.fw_version == 0x004e6601) ||
+             (smu->adev->pm.fw_version >= 0x004e7300))) ||
+           (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 10) &&
+            smu->adev->pm.fw_version >= 0x00504500)) {
+               workload_type = smu_cmn_to_asic_specific_index(smu,
+                                                              CMN2ASIC_MAPPING_WORKLOAD,
+                                                              PP_SMC_POWER_PROFILE_POWERSAVING);
+               if (workload_type >= 0)
+                       workload_mask |= 1 << workload_type;
        }
 
        ret = smu_cmn_send_smc_msg_with_param(smu,