[PATCH v2 3/8] drm/amd/pm: Add arcturus throttler translation

[Graham Sider]

Perform dependent to independent throttle status translation
for arcturus.

Signed-off-by: Graham Sider <graham.si...@amd.com>
---
 .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
index 1735a96dd307..ecc046c929fe 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
@@ -237,7 +237,7 @@ static int arcturus_tables_init(struct smu_context *smu)
                return -ENOMEM;
        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) {
                kfree(smu_table->metrics_table);
@@ -540,6 +540,52 @@ static int arcturus_freqs_in_same_level(int32_t frequency1,
        return (abs(frequency1 - frequency2) <= EPSILON);
 }
 
+static uint64_t arcturus_get_indep_throttler_status(
+                                       uint32_t dep_status)
+{
+       if (dep_status == 0)
+               return 0;
+
+       uint64_t indep_status = 0;
+
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_TEMP_EDGE_BIT, THROTTLER_TEMP_EDGE_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_TEMP_HOTSPOT_BIT, 
THROTTLER_TEMP_HOTSPOT_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_TEMP_MEM_BIT, THROTTLER_TEMP_MEM_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_TEMP_VR_GFX_BIT, 
THROTTLER_TEMP_VR_GFX_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_TEMP_VR_MEM_BIT, 
THROTTLER_TEMP_VR_MEM_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_TEMP_VR_SOC_BIT, 
THROTTLER_TEMP_VR_SOC_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_TDC_GFX_BIT, THROTTLER_TDC_GFX_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_TDC_SOC_BIT, THROTTLER_TDC_SOC_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_PPT0_BIT, THROTTLER_PPT0_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_PPT1_BIT, THROTTLER_PPT1_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_PPT2_BIT, THROTTLER_PPT2_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_PPT3_BIT, THROTTLER_PPT3_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_PPM_BIT, THROTTLER_PPM_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_FIT_BIT, THROTTLER_FIT_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_APCC_BIT, THROTTLER_APCC_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_VRHOT0_BIT, THROTTLER_VRHOT0_BIT);
+       indep_status |= smu_u64_throttler_bit(dep_status,
+                       SMU_THROTTLER_VRHOT1_BIT, THROTTLER_VRHOT1_BIT);
+
+       return indep_status;
+}
+
 static int arcturus_get_smu_metrics_data(struct smu_context *smu,
                                         MetricsMember_t member,
                                         uint32_t *value)
@@ -2275,8 +2321,8 @@ static ssize_t arcturus_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;
 
@@ -2286,7 +2332,7 @@ static ssize_t arcturus_get_gpu_metrics(struct 
smu_context *smu,
        if (ret)
                return ret;
 
-       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;
@@ -2315,6 +2361,8 @@ static ssize_t arcturus_get_gpu_metrics(struct 
smu_context *smu,
        gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
 
        gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+       gpu_metrics->indep_throttle_status =
+                       
arcturus_get_indep_throttler_status(metrics.ThrottlerStatus);
 
        gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
 
@@ -2327,7 +2375,7 @@ static ssize_t arcturus_get_gpu_metrics(struct 
smu_context *smu,
 
        *table = (void *)gpu_metrics;
 
-       return sizeof(struct gpu_metrics_v1_1);
+       return sizeof(struct gpu_metrics_v1_3);
 }
 
 static const struct pptable_funcs arcturus_ppt_funcs = {
-- 
2.17.1

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