drm/amd/pm: add the interface to dump smu metrics table for yellow carp

This patch is to add the interface to dump smu metrics table for yellow
carp.

Signed-off-by: Xiaomeng Hou <Xiaomeng.Hou@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
index db12524..24dbd4c 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
@@ -169,7 +169,7 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu)
        if (!smu_table->watermarks_table)
                goto err2_out;
 
-       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_0);
+       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_1);
        smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
        if (!smu_table->gpu_metrics_table)
                goto err3_out;
@@ -546,6 +546,59 @@ static int yellow_carp_set_power_profile_mode(struct smu_context *smu,
        return 0;
 }
 
+static ssize_t yellow_carp_get_gpu_metrics(struct smu_context *smu,
+                                               void **table)
+{
+       struct smu_table_context *smu_table = &smu->smu_table;
+       struct gpu_metrics_v2_1 *gpu_metrics =
+               (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table;
+       SmuMetrics_t metrics;
+       int ret = 0;
+
+       ret = smu_cmn_get_metrics_table(smu, &metrics, true);
+       if (ret)
+               return ret;
+
+       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 2, 1);
+
+       gpu_metrics->temperature_gfx = metrics.GfxTemperature;
+       gpu_metrics->temperature_soc = metrics.SocTemperature;
+       memcpy(&gpu_metrics->temperature_core[0],
+               &metrics.CoreTemperature[0],
+               sizeof(uint16_t) * 8);
+       gpu_metrics->temperature_l3[0] = metrics.L3Temperature;
+
+       gpu_metrics->average_gfx_activity = metrics.GfxActivity;
+       gpu_metrics->average_mm_activity = metrics.UvdActivity;
+
+       gpu_metrics->average_socket_power = metrics.CurrentSocketPower;
+       gpu_metrics->average_gfx_power = metrics.Power[0];
+       gpu_metrics->average_soc_power = metrics.Power[1];
+       memcpy(&gpu_metrics->average_core_power[0],
+               &metrics.CorePower[0],
+               sizeof(uint16_t) * 8);
+
+       gpu_metrics->average_gfxclk_frequency = metrics.GfxclkFrequency;
+       gpu_metrics->average_socclk_frequency = metrics.SocclkFrequency;
+       gpu_metrics->average_uclk_frequency = metrics.MemclkFrequency;
+       gpu_metrics->average_fclk_frequency = metrics.MemclkFrequency;
+       gpu_metrics->average_vclk_frequency = metrics.VclkFrequency;
+       gpu_metrics->average_dclk_frequency = metrics.DclkFrequency;
+
+       memcpy(&gpu_metrics->current_coreclk[0],
+               &metrics.CoreFrequency[0],
+               sizeof(uint16_t) * 8);
+       gpu_metrics->current_l3clk[0] = metrics.L3Frequency;
+
+       gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+
+       gpu_metrics->system_clock_counter = ktime_get_boottime_ns();
+
+       *table = (void *)gpu_metrics;
+
+       return sizeof(struct gpu_metrics_v2_1);
+}
+
 static int yellow_carp_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLE_COMMAND type,
                                        long input[], uint32_t size)
 {
@@ -1025,6 +1078,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = {
        .set_watermarks_table = yellow_carp_set_watermarks_table,
        .get_power_profile_mode = yellow_carp_get_power_profile_mode,
        .set_power_profile_mode = yellow_carp_set_power_profile_mode,
+       .get_gpu_metrics = yellow_carp_get_gpu_metrics,
        .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask,
        .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,
        .set_driver_table_location = smu_v13_0_1_set_driver_table_location,