Re: [PATCH 2/3] drm/amdgpu/pm: add new fields for Navi1x

Wed, 19 May 2021 08:44:15 -0700

Add a check of non-zero offsets so that it doesn't show a static voltage of 1.55v all the time. With that addressed the patch is 

Reviewed-by: Lijo Lazar <lijo.la...@amd.com>

On 5/19/2021 11:32 AM, David M Nieto wrote:

Fill voltage fields in metrics table

Signed-off-by: David M Nieto <david.ni...@amd.com>
---
  .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 58 +++++++++++++------
  1 file changed, 41 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index ac13042672ea..b8971303a873 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
@@ -505,7 +505,7 @@ static int navi10_tables_init(struct smu_context *smu)
                goto err0_out;
        smu_table->metrics_time = 0;
- smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_1); 
+       smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3);
        smu_table->gpu_metrics_table = 
kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);
        if (!smu_table->gpu_metrics_table)
                goto err1_out;
@@ -2627,8 +2627,8 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct 
smu_context *smu,
                                             void **table)
  {
        struct smu_table_context *smu_table = &smu->smu_table;
-       struct gpu_metrics_v1_1 *gpu_metrics =
-               (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table;
+       struct gpu_metrics_v1_3 *gpu_metrics =
+               (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;
        SmuMetrics_legacy_t metrics;
        int ret = 0;
@@ -2646,7 +2646,7 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct smu_context *smu, mutex_unlock(&smu->metrics_lock); - smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 1); 
+       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
gpu_metrics->temperature_edge = metrics.TemperatureEdge; 
        gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -2681,17 +2681,23 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct 
smu_context *smu,
gpu_metrics->system_clock_counter = ktime_get_boottime_ns(); + gpu_metrics->voltage_gfx = (155000 - 625 * metrics.CurrGfxVoltageOffset) / 100; 
+       gpu_metrics->voltage_mem = (155000 - 625 * metrics.CurrMemVidOffset) / 
100;
+       gpu_metrics->voltage_soc = (155000 - 625 * 
metrics.CurrSocVoltageOffset) / 100;
+
        *table = (void *)gpu_metrics;
- return sizeof(struct gpu_metrics_v1_1); 
+       return sizeof(struct gpu_metrics_v1_3);
+out:
+       return ret;
  }
static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, 
                                      void **table)
  {
        struct smu_table_context *smu_table = &smu->smu_table;
-       struct gpu_metrics_v1_1 *gpu_metrics =
-               (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table;
+       struct gpu_metrics_v1_3 *gpu_metrics =
+               (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;
        SmuMetrics_t metrics;
        int ret = 0;
@@ -2709,7 +2715,7 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, mutex_unlock(&smu->metrics_lock); - smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 1); 
+       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
gpu_metrics->temperature_edge = metrics.TemperatureEdge; 
        gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -2746,17 +2752,23 @@ static ssize_t navi10_get_gpu_metrics(struct 
smu_context *smu,
gpu_metrics->system_clock_counter = ktime_get_boottime_ns(); + gpu_metrics->voltage_gfx = (155000 - 625 * metrics.CurrGfxVoltageOffset) / 100; 
+       gpu_metrics->voltage_mem = (155000 - 625 * metrics.CurrMemVidOffset) / 
100;
+       gpu_metrics->voltage_soc = (155000 - 625 * 
metrics.CurrSocVoltageOffset) / 100;
+
        *table = (void *)gpu_metrics;
- return sizeof(struct gpu_metrics_v1_1); 
+       return sizeof(struct gpu_metrics_v1_3);
+out:
+       return ret;
  }
static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu, 
                                             void **table)
  {
        struct smu_table_context *smu_table = &smu->smu_table;
-       struct gpu_metrics_v1_1 *gpu_metrics =
-               (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table;
+       struct gpu_metrics_v1_3 *gpu_metrics =
+               (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;
        SmuMetrics_NV12_legacy_t metrics;
        int ret = 0;
@@ -2774,7 +2786,7 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu, mutex_unlock(&smu->metrics_lock); - smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 1); 
+       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
gpu_metrics->temperature_edge = metrics.TemperatureEdge; 
        gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -2814,17 +2826,23 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct 
smu_context *smu,
gpu_metrics->system_clock_counter = ktime_get_boottime_ns(); + gpu_metrics->voltage_gfx = (155000 - 625 * metrics.CurrGfxVoltageOffset) / 100; 
+       gpu_metrics->voltage_mem = (155000 - 625 * metrics.CurrMemVidOffset) / 
100;
+       gpu_metrics->voltage_soc = (155000 - 625 * 
metrics.CurrSocVoltageOffset) / 100;
+
        *table = (void *)gpu_metrics;
- return sizeof(struct gpu_metrics_v1_1); 
+       return sizeof(struct gpu_metrics_v1_3);
+out:
+       return ret;
  }
static ssize_t navi12_get_gpu_metrics(struct smu_context *smu, 
                                      void **table)
  {
        struct smu_table_context *smu_table = &smu->smu_table;
-       struct gpu_metrics_v1_1 *gpu_metrics =
-               (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table;
+       struct gpu_metrics_v1_3 *gpu_metrics =
+               (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;
        SmuMetrics_NV12_t metrics;
        int ret = 0;
@@ -2842,7 +2860,7 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context *smu, mutex_unlock(&smu->metrics_lock); - smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 1); 
+       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
gpu_metrics->temperature_edge = metrics.TemperatureEdge; 
        gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -2884,9 +2902,15 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context 
*smu,
gpu_metrics->system_clock_counter = ktime_get_boottime_ns(); + gpu_metrics->voltage_gfx = (155000 - 625 * metrics.CurrGfxVoltageOffset) / 100; 
+       gpu_metrics->voltage_mem = (155000 - 625 * metrics.CurrMemVidOffset) / 
100;
+       gpu_metrics->voltage_soc = (155000 - 625 * 
metrics.CurrSocVoltageOffset) / 100;
+
        *table = (void *)gpu_metrics;
- return sizeof(struct gpu_metrics_v1_1); 
+       return sizeof(struct gpu_metrics_v1_3);
+out:
+       return ret;
  }
static ssize_t navi1x_get_gpu_metrics(struct smu_context *smu, 



--
Thanks,
Lijo
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to