Skip to content

L
linux
Commit 8c686254 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files
Options

drm/amd/powerplay: update how to use metrics table on Sienna Cichlid 

Retrieve only those data interested instead of the whole table.
Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cf24dd27
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 54 deletions
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
View file @ 8c686254
...@@ -581,11 +581,14 @@ typedef enum { ...@@ -581,11 +581,14 @@ typedef enum {
METRICS_CURR_SOCCLK, METRICS_CURR_SOCCLK,
METRICS_CURR_UCLK, METRICS_CURR_UCLK,
METRICS_CURR_VCLK, METRICS_CURR_VCLK,
METRICS_CURR_VCLK1,
METRICS_CURR_DCLK, METRICS_CURR_DCLK,
METRICS_CURR_DCLK1,
METRICS_CURR_FCLK, METRICS_CURR_FCLK,
METRICS_CURR_DCEFCLK, METRICS_CURR_DCEFCLK,
METRICS_AVERAGE_GFXCLK, METRICS_AVERAGE_GFXCLK,
METRICS_AVERAGE_SOCCLK, METRICS_AVERAGE_SOCCLK,
METRICS_AVERAGE_FCLK,
METRICS_AVERAGE_UCLK, METRICS_AVERAGE_UCLK,
METRICS_AVERAGE_VCLK, METRICS_AVERAGE_VCLK,
METRICS_AVERAGE_DCLK, METRICS_AVERAGE_DCLK,
......
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
View file @ 8c686254
...@@ -549,16 +549,22 @@ static int sienna_cichlid_tables_init(struct smu_context *smu, struct smu_table ...@@ -549,16 +549,22 @@ static int sienna_cichlid_tables_init(struct smu_context *smu, struct smu_table
return 0; return 0;
} }
static int sienna_cichlid_get_metrics_table(struct smu_context *smu, static int sienna_cichlid_get_smu_metrics_data(struct smu_context *smu,
SmuMetrics_t *metrics_table) MetricsMember_t member,
uint32_t *value)
{ {
struct smu_table_context *smu_table= &smu->smu_table; struct smu_table_context *smu_table= &smu->smu_table;
SmuMetrics_t *metrics = (SmuMetrics_t *)smu_table->metrics_table;
int ret = 0; int ret = 0;
mutex_lock(&smu->metrics_lock); mutex_lock(&smu->metrics_lock);
if (!smu_table->metrics_time || time_after(jiffies, smu_table->metrics_time + msecs_to_jiffies(100))) { if (!smu_table->metrics_time ||
ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS, 0, time_after(jiffies, smu_table->metrics_time + msecs_to_jiffies(100))) {
(void *)smu_table->metrics_table, false); ret = smu_update_table(smu,
SMU_TABLE_SMU_METRICS,
0,
smu_table->metrics_table,
false);
if (ret) { if (ret) {
pr_info("Failed to export SMU metrics table!\n"); pr_info("Failed to export SMU metrics table!\n");
mutex_unlock(&smu->metrics_lock); mutex_unlock(&smu->metrics_lock);
...@@ -567,10 +573,81 @@ static int sienna_cichlid_get_metrics_table(struct smu_context *smu, ...@@ -567,10 +573,81 @@ static int sienna_cichlid_get_metrics_table(struct smu_context *smu,
smu_table->metrics_time = jiffies; smu_table->metrics_time = jiffies;
} }
memcpy(metrics_table, smu_table->metrics_table, sizeof(SmuMetrics_t)); switch (member) {
case METRICS_CURR_GFXCLK:
*value = metrics->CurrClock[PPCLK_GFXCLK];
break;
case METRICS_CURR_SOCCLK:
*value = metrics->CurrClock[PPCLK_SOCCLK];
break;
case METRICS_CURR_UCLK:
*value = metrics->CurrClock[PPCLK_UCLK];
break;
case METRICS_CURR_VCLK:
*value = metrics->CurrClock[PPCLK_VCLK_0];
break;
case METRICS_CURR_VCLK1:
*value = metrics->CurrClock[PPCLK_VCLK_1];
break;
case METRICS_CURR_DCLK:
*value = metrics->CurrClock[PPCLK_DCLK_0];
break;
case METRICS_CURR_DCLK1:
*value = metrics->CurrClock[PPCLK_DCLK_1];
break;
case METRICS_AVERAGE_GFXCLK:
*value = metrics->AverageGfxclkFrequency;
break;
case METRICS_AVERAGE_FCLK:
*value = metrics->AverageFclkFrequency;
break;
case METRICS_AVERAGE_UCLK:
*value = metrics->AverageUclkFrequency;
break;
case METRICS_AVERAGE_GFXACTIVITY:
*value = metrics->AverageGfxActivity;
break;
case METRICS_AVERAGE_MEMACTIVITY:
*value = metrics->AverageUclkActivity;
break;
case METRICS_AVERAGE_SOCKETPOWER:
*value = metrics->AverageSocketPower << 8;
break;
case METRICS_TEMPERATURE_EDGE:
*value = metrics->TemperatureEdge *
SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
break;
case METRICS_TEMPERATURE_HOTSPOT:
*value = metrics->TemperatureHotspot *
SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
break;
case METRICS_TEMPERATURE_MEM:
*value = metrics->TemperatureMem *
SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
break;
case METRICS_TEMPERATURE_VRGFX:
*value = metrics->TemperatureVrGfx *
SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
break;
case METRICS_TEMPERATURE_VRSOC:
*value = metrics->TemperatureVrSoc *
SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;
break;
case METRICS_THROTTLER_STATUS:
*value = metrics->ThrottlerStatus;
break;
case METRICS_CURR_FANSPEED:
*value = metrics->CurrFanSpeed;
break;
default:
*value = UINT_MAX;
break;
}
mutex_unlock(&smu->metrics_lock); mutex_unlock(&smu->metrics_lock);
return ret; return ret;
} }
static int sienna_cichlid_allocate_dpm_context(struct smu_context *smu) static int sienna_cichlid_allocate_dpm_context(struct smu_context *smu)
...@@ -696,20 +773,49 @@ static int sienna_cichlid_get_current_clk_freq_by_table(struct smu_context *smu, ...@@ -696,20 +773,49 @@ static int sienna_cichlid_get_current_clk_freq_by_table(struct smu_context *smu,
enum smu_clk_type clk_type, enum smu_clk_type clk_type,
uint32_t *value) uint32_t *value)
{ {
int ret = 0, clk_id = 0; MetricsMember_t member_type;
SmuMetrics_t metrics; int clk_id = 0;
ret = sienna_cichlid_get_metrics_table(smu, &metrics);
if (ret)
return ret;
clk_id = smu_clk_get_index(smu, clk_type); clk_id = smu_clk_get_index(smu, clk_type);
if (clk_id < 0) if (clk_id < 0)
return clk_id; return clk_id;
*value = metrics.CurrClock[clk_id]; switch (clk_id) {
case PPCLK_GFXCLK:
member_type = METRICS_CURR_GFXCLK;
break;
case PPCLK_UCLK:
member_type = METRICS_CURR_UCLK;
break;
case PPCLK_SOCCLK:
member_type = METRICS_CURR_SOCCLK;
break;
case PPCLK_FCLK:
member_type = METRICS_CURR_FCLK;
break;
case PPCLK_VCLK_0:
member_type = METRICS_CURR_VCLK;
break;
case PPCLK_VCLK_1:
member_type = METRICS_CURR_VCLK1;
break;
case PPCLK_DCLK_0:
member_type = METRICS_CURR_DCLK;
break;
case PPCLK_DCLK_1:
member_type = METRICS_CURR_DCLK1;
break;
case PPCLK_DCEFCLK:
member_type = METRICS_CURR_DCEFCLK;
break;
default:
return -EINVAL;
}
return sienna_cichlid_get_smu_metrics_data(smu,
member_type,
value);
return ret;
} }
static bool sienna_cichlid_is_support_fine_grained_dpm(struct smu_context *smu, enum smu_clk_type clk_type) static bool sienna_cichlid_is_support_fine_grained_dpm(struct smu_context *smu, enum smu_clk_type clk_type)
...@@ -996,19 +1102,12 @@ static int sienna_cichlid_unforce_dpm_levels(struct smu_context *smu) ...@@ -996,19 +1102,12 @@ static int sienna_cichlid_unforce_dpm_levels(struct smu_context *smu)
static int sienna_cichlid_get_gpu_power(struct smu_context *smu, uint32_t *value) static int sienna_cichlid_get_gpu_power(struct smu_context *smu, uint32_t *value)
{ {
int ret = 0;
SmuMetrics_t metrics;
if (!value) if (!value)
return -EINVAL; return -EINVAL;
ret = sienna_cichlid_get_metrics_table(smu, &metrics); return sienna_cichlid_get_smu_metrics_data(smu,
if (ret) METRICS_AVERAGE_SOCKETPOWER,
return ret; value);
*value = metrics.AverageSocketPower << 8;
return 0;
} }
static int sienna_cichlid_get_current_activity_percent(struct smu_context *smu, static int sienna_cichlid_get_current_activity_percent(struct smu_context *smu,
...@@ -1016,28 +1115,27 @@ static int sienna_cichlid_get_current_activity_percent(struct smu_context *smu, ...@@ -1016,28 +1115,27 @@ static int sienna_cichlid_get_current_activity_percent(struct smu_context *smu,
uint32_t *value) uint32_t *value)
{ {
int ret = 0; int ret = 0;
SmuMetrics_t metrics;
if (!value) if (!value)
return -EINVAL; return -EINVAL;
ret = sienna_cichlid_get_metrics_table(smu, &metrics);
if (ret)
return ret;
switch (sensor) { switch (sensor) {
case AMDGPU_PP_SENSOR_GPU_LOAD: case AMDGPU_PP_SENSOR_GPU_LOAD:
*value = metrics.AverageGfxActivity; ret = sienna_cichlid_get_smu_metrics_data(smu,
METRICS_AVERAGE_GFXACTIVITY,
value);
break; break;
case AMDGPU_PP_SENSOR_MEM_LOAD: case AMDGPU_PP_SENSOR_MEM_LOAD:
*value = metrics.AverageUclkActivity; ret = sienna_cichlid_get_smu_metrics_data(smu,
METRICS_AVERAGE_MEMACTIVITY,
value);
break; break;
default: default:
pr_err("Invalid sensor for retrieving clock activity\n"); pr_err("Invalid sensor for retrieving clock activity\n");
return -EINVAL; return -EINVAL;
} }
return 0; return ret;
} }
static bool sienna_cichlid_is_dpm_running(struct smu_context *smu) static bool sienna_cichlid_is_dpm_running(struct smu_context *smu)
...@@ -1054,19 +1152,12 @@ static bool sienna_cichlid_is_dpm_running(struct smu_context *smu) ...@@ -1054,19 +1152,12 @@ static bool sienna_cichlid_is_dpm_running(struct smu_context *smu)
static int sienna_cichlid_get_fan_speed_rpm(struct smu_context *smu, static int sienna_cichlid_get_fan_speed_rpm(struct smu_context *smu,
uint32_t *speed) uint32_t *speed)
{ {
SmuMetrics_t metrics;
int ret = 0;
if (!speed) if (!speed)
return -EINVAL; return -EINVAL;
ret = sienna_cichlid_get_metrics_table(smu, &metrics); return sienna_cichlid_get_smu_metrics_data(smu,
if (ret) METRICS_CURR_FANSPEED,
return ret; speed);
*speed = metrics.CurrFanSpeed;
return ret;
} }
static int sienna_cichlid_get_fan_speed_percent(struct smu_context *smu, static int sienna_cichlid_get_fan_speed_percent(struct smu_context *smu,
...@@ -1423,35 +1514,33 @@ static int sienna_cichlid_thermal_get_temperature(struct smu_context *smu, ...@@ -1423,35 +1514,33 @@ static int sienna_cichlid_thermal_get_temperature(struct smu_context *smu,
enum amd_pp_sensors sensor, enum amd_pp_sensors sensor,
uint32_t *value) uint32_t *value)
{ {
SmuMetrics_t metrics;
int ret = 0; int ret = 0;
if (!value) if (!value)
return -EINVAL; return -EINVAL;
ret = sienna_cichlid_get_metrics_table(smu, &metrics);
if (ret)
return ret;
switch (sensor) { switch (sensor) {
case AMDGPU_PP_SENSOR_HOTSPOT_TEMP: case AMDGPU_PP_SENSOR_HOTSPOT_TEMP:
*value = metrics.TemperatureHotspot * ret = sienna_cichlid_get_smu_metrics_data(smu,
SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; METRICS_TEMPERATURE_HOTSPOT,
value);
break; break;
case AMDGPU_PP_SENSOR_EDGE_TEMP: case AMDGPU_PP_SENSOR_EDGE_TEMP:
*value = metrics.TemperatureEdge * ret = sienna_cichlid_get_smu_metrics_data(smu,
SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; METRICS_TEMPERATURE_EDGE,
value);
break; break;
case AMDGPU_PP_SENSOR_MEM_TEMP: case AMDGPU_PP_SENSOR_MEM_TEMP:
*value = metrics.TemperatureMem * ret = sienna_cichlid_get_smu_metrics_data(smu,
SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; METRICS_TEMPERATURE_MEM,
value);
break; break;
default: default:
pr_err("Invalid sensor for retrieving temp\n"); pr_err("Invalid sensor for retrieving temp\n");
return -EINVAL; return -EINVAL;
} }
return 0; return ret;
} }
static int sienna_cichlid_read_sensor(struct smu_context *smu, static int sienna_cichlid_read_sensor(struct smu_context *smu,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7