drm/amd/powerplay: add control method to bypass metrics cache on Arcturus

As for the gpu metric export, metrics cache makes no sense. It's up to
user to decide how often the metrics should be retrieved.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
index 5aa0d5b03f7e59e5ce86da06d8f881f7f5a1cfa6..e3a2d7f0aba15ab86ee69b7f813304580bd3fb71 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
@@ -541,18 +541,16 @@ static int arcturus_freqs_in_same_level(int32_t frequency1,
        return (abs(frequency1 - frequency2) <= EPSILON);
 }
 
-static int arcturus_get_smu_metrics_data(struct smu_context *smu,
-                                        MetricsMember_t member,
-                                        uint32_t *value)
+static int arcturus_get_metrics_table_locked(struct smu_context *smu,
+                                            SmuMetrics_t *metrics_table,
+                                            bool bypass_cache)
 {
        struct smu_table_context *smu_table= &smu->smu_table;
-       SmuMetrics_t *metrics = (SmuMetrics_t *)smu_table->metrics_table;
        int ret = 0;
 
-       mutex_lock(&smu->metrics_lock);
-
-       if (!smu_table->metrics_time ||
-            time_after(jiffies, smu_table->metrics_time + msecs_to_jiffies(1))) {
+       if (bypass_cache ||
+           !smu_table->metrics_time ||
+           time_after(jiffies, smu_table->metrics_time + msecs_to_jiffies(1))) {
                ret = smu_cmn_update_table(smu,
                                       SMU_TABLE_SMU_METRICS,
                                       0,
@@ -560,12 +558,50 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,
                                       false);
                if (ret) {
                        dev_info(smu->adev->dev, "Failed to export SMU metrics table!\n");
-                       mutex_unlock(&smu->metrics_lock);
                        return ret;
                }
                smu_table->metrics_time = jiffies;
        }
 
+       if (metrics_table)
+               memcpy(metrics_table, smu_table->metrics_table, sizeof(SmuMetrics_t));
+
+       return 0;
+}
+
+static int arcturus_get_metrics_table(struct smu_context *smu,
+                                     SmuMetrics_t *metrics_table,
+                                     bool bypass_cache)
+{
+       int ret = 0;
+
+       mutex_lock(&smu->metrics_lock);
+       ret = arcturus_get_metrics_table_locked(smu,
+                                               metrics_table,
+                                               bypass_cache);
+       mutex_unlock(&smu->metrics_lock);
+
+       return ret;
+}
+
+static int arcturus_get_smu_metrics_data(struct smu_context *smu,
+                                        MetricsMember_t member,
+                                        uint32_t *value)
+{
+       struct smu_table_context *smu_table= &smu->smu_table;
+       SmuMetrics_t *metrics = (SmuMetrics_t *)smu_table->metrics_table;
+       int ret = 0;
+
+       mutex_lock(&smu->metrics_lock);
+
+       ret = arcturus_get_metrics_table_locked(smu,
+                                               NULL,
+                                               false);
+       if (ret) {
+               mutex_unlock(&smu->metrics_lock);
+               return ret;
+       }
+
        switch (member) {
        case METRICS_CURR_GFXCLK:
                *value = metrics->CurrClock[PPCLK_GFXCLK];
@@ -2273,23 +2309,11 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu,
        SmuMetrics_t metrics;
        int ret = 0;
 
-       mutex_lock(&smu->metrics_lock);
-
-       ret = smu_cmn_update_table(smu,
-                                  SMU_TABLE_SMU_METRICS,
-                                  0,
-                                  smu_table->metrics_table,
-                                  false);
-       if (ret) {
-               dev_info(smu->adev->dev, "Failed to export SMU metrics table!\n");
-               mutex_unlock(&smu->metrics_lock);
+       ret = arcturus_get_metrics_table(smu,
+                                        &metrics,
+                                        true);
+       if (ret)
                return ret;
-       }
-       smu_table->metrics_time = jiffies;
-
-       memcpy(&metrics, smu_table->metrics_table, sizeof(SmuMetrics_t));
-
-       mutex_unlock(&smu->metrics_lock);
 
        smu_v11_0_init_gpu_metrics_v1_0(gpu_metrics);