]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/amdgpu/smu13: drop compute workload workaround
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 1 Nov 2023 19:48:14 +0000 (15:48 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 3 Nov 2023 15:59:51 +0000 (11:59 -0400)
This was fixed in PMFW before launch and is no longer
required.

Reviewed-by: Yang Wang <kevinyang.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c

index ef0c3007565890880832ad81fa36d526b898a376..82c4e1f1c6f075d09dbb9e407e69a8405a9e8c5b 100644 (file)
@@ -2530,38 +2530,10 @@ static int smu_v13_0_0_set_power_profile_mode(struct smu_context *smu,
                }
        }
 
-       if (smu->power_profile_mode == PP_SMC_POWER_PROFILE_COMPUTE &&
-               (((smu->adev->pdev->device == 0x744C) && (smu->adev->pdev->revision == 0xC8)) ||
-               ((smu->adev->pdev->device == 0x744C) && (smu->adev->pdev->revision == 0xCC)))) {
-               ret = smu_cmn_update_table(smu,
-                                          SMU_TABLE_ACTIVITY_MONITOR_COEFF,
-                                          WORKLOAD_PPLIB_COMPUTE_BIT,
-                                          (void *)(&activity_monitor_external),
-                                          false);
-               if (ret) {
-                       dev_err(smu->adev->dev, "[%s] Failed to get activity monitor!", __func__);
-                       return ret;
-               }
-
-               ret = smu_cmn_update_table(smu,
-                                          SMU_TABLE_ACTIVITY_MONITOR_COEFF,
-                                          WORKLOAD_PPLIB_CUSTOM_BIT,
-                                          (void *)(&activity_monitor_external),
-                                          true);
-               if (ret) {
-                       dev_err(smu->adev->dev, "[%s] Failed to set activity monitor!", __func__);
-                       return ret;
-               }
-
-               workload_type = smu_cmn_to_asic_specific_index(smu,
-                                                      CMN2ASIC_MAPPING_WORKLOAD,
-                                                      PP_SMC_POWER_PROFILE_CUSTOM);
-       } else {
-               /* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */
-               workload_type = smu_cmn_to_asic_specific_index(smu,
+       /* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */
+       workload_type = smu_cmn_to_asic_specific_index(smu,
                                                       CMN2ASIC_MAPPING_WORKLOAD,
                                                       smu->power_profile_mode);
-       }
 
        if (workload_type < 0)
                return -EINVAL;