]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amd/powerplay: implement pp_power_profile_mode sys inerface for SMU11
authorChengming Gui <Jack.Gui@amd.com>
Mon, 14 Jan 2019 06:37:31 +0000 (14:37 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 19 Mar 2019 20:03:59 +0000 (15:03 -0500)
Add set/get power profile mode functions.
Added dependency interfaces:
1) vega20_set_activity_monitor_coeff
2) vega20_get_activity_monitor_coeff
3) conv_power_profile_to_pplib_workload

Signed-off-by: Chengming Gui <Jack.Gui@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
drivers/gpu/drm/amd/powerplay/smu_v11_0.c

index f36e86b11880f34f1dc3f52f6b23d105c7f1dab3..694d85b0f0a0546b542ff7a93a19bbb77af59436 100644 (file)
@@ -1135,7 +1135,9 @@ static ssize_t amdgpu_get_pp_power_profile_mode(struct device *dev,
        struct drm_device *ddev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = ddev->dev_private;
 
-       if (adev->powerplay.pp_funcs->get_power_profile_mode)
+       if (is_support_sw_smu(adev))
+               return smu_get_power_profile_mode(&adev->smu, buf);
+       else if (adev->powerplay.pp_funcs->get_power_profile_mode)
                return amdgpu_dpm_get_power_profile_mode(adev, buf);
 
        return snprintf(buf, PAGE_SIZE, "\n");
@@ -1185,9 +1187,10 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev,
                }
        }
        parameter[parameter_size] = profile_mode;
-       if (adev->powerplay.pp_funcs->set_power_profile_mode)
+       if (is_support_sw_smu(adev))
+               ret = smu_set_power_profile_mode(&adev->smu, parameter, parameter_size);
+       else if (adev->powerplay.pp_funcs->set_power_profile_mode)
                ret = amdgpu_dpm_set_power_profile_mode(adev, parameter, parameter_size);
-
        if (!ret)
                return count;
 fail:
index 81939c40b9bcc5b7ac2909639fbb3a82e9c6dfb4..f0e5bfc0deeb1af27c6ce87901c01bff19defd7f 100644 (file)
@@ -330,6 +330,25 @@ static int smu_sw_init(void *handle)
        bitmap_zero(smu->smu_feature.enabled, SMU_FEATURE_MAX);
        bitmap_zero(smu->smu_feature.allowed, SMU_FEATURE_MAX);
        smu->watermarks_bitmap = 0;
+       smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
+       smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
+
+       smu->workload_mask = 1 << smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT];
+       smu->workload_prority[PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT] = 0;
+       smu->workload_prority[PP_SMC_POWER_PROFILE_FULLSCREEN3D] = 1;
+       smu->workload_prority[PP_SMC_POWER_PROFILE_POWERSAVING] = 2;
+       smu->workload_prority[PP_SMC_POWER_PROFILE_VIDEO] = 3;
+       smu->workload_prority[PP_SMC_POWER_PROFILE_VR] = 4;
+       smu->workload_prority[PP_SMC_POWER_PROFILE_COMPUTE] = 5;
+       smu->workload_prority[PP_SMC_POWER_PROFILE_CUSTOM] = 6;
+
+       smu->workload_setting[0] = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
+       smu->workload_setting[1] = PP_SMC_POWER_PROFILE_FULLSCREEN3D;
+       smu->workload_setting[2] = PP_SMC_POWER_PROFILE_POWERSAVING;
+       smu->workload_setting[3] = PP_SMC_POWER_PROFILE_VIDEO;
+       smu->workload_setting[4] = PP_SMC_POWER_PROFILE_VR;
+       smu->workload_setting[5] = PP_SMC_POWER_PROFILE_COMPUTE;
+       smu->workload_setting[6] = PP_SMC_POWER_PROFILE_CUSTOM;
 
        ret = smu_init_microcode(smu);
        if (ret) {
index c1357ebc61878c764f4da2a3ecd6928cfb570c74..2c3ce9c3bfd48a1e7e0873edb2b6473f64d72895 100644 (file)
@@ -335,6 +335,7 @@ struct smu_feature
        DECLARE_BITMAP(enabled, SMU_FEATURE_MAX);
 };
 
+#define WORKLOAD_POLICY_MAX 7
 struct smu_context
 {
        struct amdgpu_device            *adev;
@@ -361,6 +362,12 @@ struct smu_context
 #define WATERMARKS_EXIST       (1 << 0)
 #define WATERMARKS_LOADED      (1 << 1)
        uint32_t watermarks_bitmap;
+
+       uint32_t workload_mask;
+       uint32_t workload_prority[WORKLOAD_POLICY_MAX];
+       uint32_t workload_setting[WORKLOAD_POLICY_MAX];
+       uint32_t power_profile_mode;
+       uint32_t default_power_profile_mode;
 };
 
 struct pptable_funcs {
@@ -389,6 +396,8 @@ struct pptable_funcs {
                                              struct
                                              pp_clock_levels_with_voltage
                                              *clocks);
+       int (*get_power_profile_mode)(struct smu_context *smu, char *buf);
+       int (*set_power_profile_mode)(struct smu_context *smu, long *input, uint32_t size);
 };
 
 struct smu_funcs
@@ -453,6 +462,15 @@ struct smu_funcs
        int (*set_watermarks_for_clock_ranges)(struct smu_context *smu,
                                               struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges);
        int (*set_od8_default_settings)(struct smu_context *smu);
+       int (*get_activity_monitor_coeff)(struct smu_context *smu,
+                                     uint8_t *table,
+                                     uint16_t workload_type);
+       int (*set_activity_monitor_coeff)(struct smu_context *smu,
+                                     uint8_t *table,
+                                     uint16_t workload_type);
+       int (*conv_power_profile_to_pplib_workload)(int power_profile);
+       int (*get_power_profile_mode)(struct smu_context *smu, char *buf);
+       int (*set_power_profile_mode)(struct smu_context *smu, long *input, uint32_t size);
 };
 
 #define smu_init_microcode(smu) \
@@ -547,6 +565,10 @@ struct smu_funcs
        ((smu)->funcs->start_thermal_control? (smu)->funcs->start_thermal_control((smu)) : 0)
 #define smu_read_sensor(smu, sensor, data, size) \
        ((smu)->funcs->read_sensor? (smu)->funcs->read_sensor((smu), (sensor), (data), (size)) : 0)
+#define smu_get_power_profile_mode(smu, buf) \
+       ((smu)->funcs->get_power_profile_mode ? (smu)->funcs->get_power_profile_mode((smu), buf) : 0)
+#define smu_set_power_profile_mode(smu, param, param_size) \
+       ((smu)->funcs->set_power_profile_mode ? (smu)->funcs->set_power_profile_mode((smu), (param), (param_size)) : 0)
 
 #define smu_msg_get_index(smu, msg) \
        ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_msg_index? (smu)->ppt_funcs->get_smu_msg_index((smu), (msg)) : -EINVAL) : -EINVAL)
index 94fe4530372685f8d4878f490d13f4d985a2fed8..63cadb69c5486274f29c0422264155cba2f635f7 100644 (file)
@@ -310,6 +310,10 @@ static int smu_v11_0_init_smc_tables(struct smu_context *smu)
                       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
        SMU_TABLE_INIT(tables, TABLE_PMSTATUSLOG, SMU11_TOOL_SIZE, PAGE_SIZE,
                       AMDGPU_GEM_DOMAIN_VRAM);
+       SMU_TABLE_INIT(tables, TABLE_ACTIVITY_MONITOR_COEFF,
+                      sizeof(DpmActivityMonitorCoeffInt_t),
+                      PAGE_SIZE,
+                      AMDGPU_GEM_DOMAIN_VRAM);
 
        ret = smu_v11_0_init_dpm_context(smu);
        if (ret)
@@ -1239,6 +1243,290 @@ static int smu_v11_0_set_od8_default_settings(struct smu_context *smu)
        return 0;
 }
 
+static int smu_v11_0_set_activity_monitor_coeff(struct smu_context *smu,
+                                     uint8_t *table, uint16_t workload_type)
+{
+       int ret = 0;
+       memcpy(smu->smu_table.tables[TABLE_ACTIVITY_MONITOR_COEFF].cpu_addr,
+              table, smu->smu_table.tables[TABLE_ACTIVITY_MONITOR_COEFF].size);
+       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetDriverDramAddrHigh,
+                                         upper_32_bits(smu->smu_table.tables[TABLE_ACTIVITY_MONITOR_COEFF].mc_address));
+       if (ret) {
+               pr_err("[%s] Attempt to Set Dram Addr High Failed!", __func__);
+               return ret;
+       }
+       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetDriverDramAddrLow,
+                                         lower_32_bits(smu->smu_table.tables[TABLE_ACTIVITY_MONITOR_COEFF].mc_address));
+       if (ret) {
+               pr_err("[%s] Attempt to Set Dram Addr Low Failed!", __func__);
+               return ret;
+       }
+       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_TransferTableSmu2Dram,
+                                         TABLE_ACTIVITY_MONITOR_COEFF | (workload_type << 16));
+       if (ret) {
+               pr_err("[%s] Attempt to Transfer Table From SMU Failed!", __func__);
+               return ret;
+       }
+
+       return ret;
+}
+
+static int smu_v11_0_get_activity_monitor_coeff(struct smu_context *smu,
+                                     uint8_t *table, uint16_t workload_type)
+{
+       int ret = 0;
+       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetDriverDramAddrHigh,
+                                         upper_32_bits(smu->smu_table.tables[TABLE_ACTIVITY_MONITOR_COEFF].mc_address));
+       if (ret) {
+               pr_err("[%s] Attempt to Set Dram Addr High Failed!", __func__);
+               return ret;
+       }
+
+       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetDriverDramAddrLow,
+                                         lower_32_bits(smu->smu_table.tables[TABLE_ACTIVITY_MONITOR_COEFF].mc_address));
+       if (ret) {
+               pr_err("[%s] Attempt to Set Dram Addr Low Failed!", __func__);
+               return ret;
+       }
+
+       ret = smu_send_smc_msg_with_param(smu, SMU_MSG_TransferTableSmu2Dram,
+                                         TABLE_ACTIVITY_MONITOR_COEFF | (workload_type << 16));
+       if (ret) {
+               pr_err("[%s] Attempt to Transfer Table From SMU Failed!", __func__);
+               return ret;
+       }
+
+       return ret;
+}
+
+static int smu_v11_0_conv_power_profile_to_pplib_workload(int power_profile)
+{
+       int pplib_workload = 0;
+
+       switch (power_profile) {
+       case PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT:
+            pplib_workload = WORKLOAD_DEFAULT_BIT;
+            break;
+       case PP_SMC_POWER_PROFILE_FULLSCREEN3D:
+            pplib_workload = WORKLOAD_PPLIB_FULL_SCREEN_3D_BIT;
+            break;
+       case PP_SMC_POWER_PROFILE_POWERSAVING:
+            pplib_workload = WORKLOAD_PPLIB_POWER_SAVING_BIT;
+            break;
+       case PP_SMC_POWER_PROFILE_VIDEO:
+            pplib_workload = WORKLOAD_PPLIB_VIDEO_BIT;
+            break;
+       case PP_SMC_POWER_PROFILE_VR:
+            pplib_workload = WORKLOAD_PPLIB_VR_BIT;
+            break;
+       case PP_SMC_POWER_PROFILE_COMPUTE:
+            pplib_workload = WORKLOAD_PPLIB_COMPUTE_BIT;
+            break;
+       case PP_SMC_POWER_PROFILE_CUSTOM:
+               pplib_workload = WORKLOAD_PPLIB_CUSTOM_BIT;
+               break;
+       }
+
+       return pplib_workload;
+}
+
+static int smu_v11_0_get_power_profile_mode(struct smu_context *smu, char *buf)
+{
+       DpmActivityMonitorCoeffInt_t activity_monitor;
+       uint32_t i, size = 0;
+       uint16_t workload_type = 0;
+       static const char *profile_name[] = {
+                                       "BOOTUP_DEFAULT",
+                                       "3D_FULL_SCREEN",
+                                       "POWER_SAVING",
+                                       "VIDEO",
+                                       "VR",
+                                       "COMPUTE",
+                                       "CUSTOM"};
+       static const char *title[] = {
+                       "PROFILE_INDEX(NAME)",
+                       "CLOCK_TYPE(NAME)",
+                       "FPS",
+                       "UseRlcBusy",
+                       "MinActiveFreqType",
+                       "MinActiveFreq",
+                       "BoosterFreqType",
+                       "BoosterFreq",
+                       "PD_Data_limit_c",
+                       "PD_Data_error_coeff",
+                       "PD_Data_error_rate_coeff"};
+       int result = 0;
+
+       if (!buf)
+               return -EINVAL;
+
+       size += sprintf(buf + size, "%16s %s %s %s %s %s %s %s %s %s %s\n",
+                       title[0], title[1], title[2], title[3], title[4], title[5],
+                       title[6], title[7], title[8], title[9], title[10]);
+
+       for (i = 0; i <= PP_SMC_POWER_PROFILE_CUSTOM; i++) {
+               /* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */
+               workload_type = smu_v11_0_conv_power_profile_to_pplib_workload(i);
+               result = smu_v11_0_get_activity_monitor_coeff(smu,
+                                                             (uint8_t *)(&activity_monitor),
+                                                             workload_type);
+               if (result) {
+                       pr_err("[%s] Failed to get activity monitor!", __func__);
+                       return result;
+               }
+
+               size += sprintf(buf + size, "%2d %14s%s:\n",
+                       i, profile_name[i], (i == smu->power_profile_mode) ? "*" : " ");
+
+               size += sprintf(buf + size, "%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n",
+                       " ",
+                       0,
+                       "GFXCLK",
+                       activity_monitor.Gfx_FPS,
+                       activity_monitor.Gfx_UseRlcBusy,
+                       activity_monitor.Gfx_MinActiveFreqType,
+                       activity_monitor.Gfx_MinActiveFreq,
+                       activity_monitor.Gfx_BoosterFreqType,
+                       activity_monitor.Gfx_BoosterFreq,
+                       activity_monitor.Gfx_PD_Data_limit_c,
+                       activity_monitor.Gfx_PD_Data_error_coeff,
+                       activity_monitor.Gfx_PD_Data_error_rate_coeff);
+
+               size += sprintf(buf + size, "%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n",
+                       " ",
+                       1,
+                       "SOCCLK",
+                       activity_monitor.Soc_FPS,
+                       activity_monitor.Soc_UseRlcBusy,
+                       activity_monitor.Soc_MinActiveFreqType,
+                       activity_monitor.Soc_MinActiveFreq,
+                       activity_monitor.Soc_BoosterFreqType,
+                       activity_monitor.Soc_BoosterFreq,
+                       activity_monitor.Soc_PD_Data_limit_c,
+                       activity_monitor.Soc_PD_Data_error_coeff,
+                       activity_monitor.Soc_PD_Data_error_rate_coeff);
+
+               size += sprintf(buf + size, "%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n",
+                       " ",
+                       2,
+                       "UCLK",
+                       activity_monitor.Mem_FPS,
+                       activity_monitor.Mem_UseRlcBusy,
+                       activity_monitor.Mem_MinActiveFreqType,
+                       activity_monitor.Mem_MinActiveFreq,
+                       activity_monitor.Mem_BoosterFreqType,
+                       activity_monitor.Mem_BoosterFreq,
+                       activity_monitor.Mem_PD_Data_limit_c,
+                       activity_monitor.Mem_PD_Data_error_coeff,
+                       activity_monitor.Mem_PD_Data_error_rate_coeff);
+
+               size += sprintf(buf + size, "%19s %d(%13s) %7d %7d %7d %7d %7d %7d %7d %7d %7d\n",
+                       " ",
+                       3,
+                       "FCLK",
+                       activity_monitor.Fclk_FPS,
+                       activity_monitor.Fclk_UseRlcBusy,
+                       activity_monitor.Fclk_MinActiveFreqType,
+                       activity_monitor.Fclk_MinActiveFreq,
+                       activity_monitor.Fclk_BoosterFreqType,
+                       activity_monitor.Fclk_BoosterFreq,
+                       activity_monitor.Fclk_PD_Data_limit_c,
+                       activity_monitor.Fclk_PD_Data_error_coeff,
+                       activity_monitor.Fclk_PD_Data_error_rate_coeff);
+       }
+
+       return size;
+}
+
+static int smu_v11_0_set_power_profile_mode(struct smu_context *smu, long *input, uint32_t size)
+{
+       DpmActivityMonitorCoeffInt_t activity_monitor;
+       int workload_type, ret = 0;
+
+       smu->power_profile_mode = input[size];
+
+       if (smu->power_profile_mode > PP_SMC_POWER_PROFILE_CUSTOM) {
+               pr_err("Invalid power profile mode %d\n", smu->power_profile_mode);
+               return -EINVAL;
+       }
+
+       if (smu->power_profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) {
+               if (size < 0)
+                       return -EINVAL;
+
+               ret = smu_v11_0_get_activity_monitor_coeff(smu,
+                                                          (uint8_t *)(&activity_monitor),
+                                                          WORKLOAD_PPLIB_CUSTOM_BIT);
+               if (ret) {
+                       pr_err("[%s] Failed to get activity monitor!", __func__);
+                       return ret;
+               }
+
+               switch (input[0]) {
+               case 0: /* Gfxclk */
+                       activity_monitor.Gfx_FPS = input[1];
+                       activity_monitor.Gfx_UseRlcBusy = input[2];
+                       activity_monitor.Gfx_MinActiveFreqType = input[3];
+                       activity_monitor.Gfx_MinActiveFreq = input[4];
+                       activity_monitor.Gfx_BoosterFreqType = input[5];
+                       activity_monitor.Gfx_BoosterFreq = input[6];
+                       activity_monitor.Gfx_PD_Data_limit_c = input[7];
+                       activity_monitor.Gfx_PD_Data_error_coeff = input[8];
+                       activity_monitor.Gfx_PD_Data_error_rate_coeff = input[9];
+                       break;
+               case 1: /* Socclk */
+                       activity_monitor.Soc_FPS = input[1];
+                       activity_monitor.Soc_UseRlcBusy = input[2];
+                       activity_monitor.Soc_MinActiveFreqType = input[3];
+                       activity_monitor.Soc_MinActiveFreq = input[4];
+                       activity_monitor.Soc_BoosterFreqType = input[5];
+                       activity_monitor.Soc_BoosterFreq = input[6];
+                       activity_monitor.Soc_PD_Data_limit_c = input[7];
+                       activity_monitor.Soc_PD_Data_error_coeff = input[8];
+                       activity_monitor.Soc_PD_Data_error_rate_coeff = input[9];
+                       break;
+               case 2: /* Uclk */
+                       activity_monitor.Mem_FPS = input[1];
+                       activity_monitor.Mem_UseRlcBusy = input[2];
+                       activity_monitor.Mem_MinActiveFreqType = input[3];
+                       activity_monitor.Mem_MinActiveFreq = input[4];
+                       activity_monitor.Mem_BoosterFreqType = input[5];
+                       activity_monitor.Mem_BoosterFreq = input[6];
+                       activity_monitor.Mem_PD_Data_limit_c = input[7];
+                       activity_monitor.Mem_PD_Data_error_coeff = input[8];
+                       activity_monitor.Mem_PD_Data_error_rate_coeff = input[9];
+                       break;
+               case 3: /* Fclk */
+                       activity_monitor.Fclk_FPS = input[1];
+                       activity_monitor.Fclk_UseRlcBusy = input[2];
+                       activity_monitor.Fclk_MinActiveFreqType = input[3];
+                       activity_monitor.Fclk_MinActiveFreq = input[4];
+                       activity_monitor.Fclk_BoosterFreqType = input[5];
+                       activity_monitor.Fclk_BoosterFreq = input[6];
+                       activity_monitor.Fclk_PD_Data_limit_c = input[7];
+                       activity_monitor.Fclk_PD_Data_error_coeff = input[8];
+                       activity_monitor.Fclk_PD_Data_error_rate_coeff = input[9];
+                       break;
+               }
+
+               ret = smu_v11_0_set_activity_monitor_coeff(smu,
+                                                          (uint8_t *)(&activity_monitor),
+                                                          WORKLOAD_PPLIB_CUSTOM_BIT);
+               if (ret) {
+                       pr_err("[%s] Failed to set activity monitor!", __func__);
+                       return ret;
+               }
+       }
+
+       /* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB_*_BIT */
+       workload_type =
+               smu_v11_0_conv_power_profile_to_pplib_workload(smu->power_profile_mode);
+       smu_send_smc_msg_with_param(smu, SMU_MSG_SetWorkloadMask,
+                                   1 << workload_type);
+
+       return ret;
+}
+
 static const struct smu_funcs smu_v11_0_funcs = {
        .init_microcode = smu_v11_0_init_microcode,
        .load_microcode = smu_v11_0_load_microcode,
@@ -1277,6 +1565,11 @@ static const struct smu_funcs smu_v11_0_funcs = {
        .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request,
        .set_watermarks_for_clock_ranges = smu_v11_0_set_watermarks_for_clock_ranges,
        .set_od8_default_settings = smu_v11_0_set_od8_default_settings,
+       .get_activity_monitor_coeff = smu_v11_0_get_activity_monitor_coeff,
+       .set_activity_monitor_coeff = smu_v11_0_set_activity_monitor_coeff,
+       .conv_power_profile_to_pplib_workload = smu_v11_0_conv_power_profile_to_pplib_workload,
+       .get_power_profile_mode = smu_v11_0_get_power_profile_mode,
+       .set_power_profile_mode = smu_v11_0_set_power_profile_mode,
 };
 
 void smu_v11_0_set_smu_funcs(struct smu_context *smu)