diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3183-drm-amd-powerplay-support-sensor-reading-on-arcturus.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3183-drm-amd-powerplay-support-sensor-reading-on-arcturus.patch | 180 |
1 files changed, 180 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3183-drm-amd-powerplay-support-sensor-reading-on-arcturus.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3183-drm-amd-powerplay-support-sensor-reading-on-arcturus.patch new file mode 100644 index 00000000..2384fdff --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3183-drm-amd-powerplay-support-sensor-reading-on-arcturus.patch @@ -0,0 +1,180 @@ +From 2c1deffb5455cc892cc3bd6b9f11801f6e5d6aa2 Mon Sep 17 00:00:00 2001 +From: Evan Quan <evan.quan@amd.com> +Date: Mon, 29 Jul 2019 13:18:37 -0500 +Subject: [PATCH 3183/4256] drm/amd/powerplay: support sensor reading on + arcturus + +Support sensor reading for gpu loading, power and +temperatures. + +Signed-off-by: Evan Quan <evan.quan@amd.com> +Reviewed-by: Kevin Wang <kevin1.wang@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 142 +++++++++++++++++++ + 1 file changed, 142 insertions(+) + +diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +index 53199f4046e0..6aa7f1f62a81 100644 +--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +@@ -853,6 +853,147 @@ static int arcturus_get_thermal_temperature_range(struct smu_context *smu, + return 0; + } + ++static int arcturus_get_metrics_table(struct smu_context *smu, ++ SmuMetrics_t *metrics_table) ++{ ++ struct smu_table_context *smu_table= &smu->smu_table; ++ int ret = 0; ++ ++ if (!smu_table->metrics_time || ++ time_after(jiffies, smu_table->metrics_time + HZ / 1000)) { ++ ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS, 0, ++ (void *)smu_table->metrics_table, false); ++ if (ret) { ++ pr_info("Failed to export SMU metrics table!\n"); ++ return ret; ++ } ++ smu_table->metrics_time = jiffies; ++ } ++ ++ memcpy(metrics_table, smu_table->metrics_table, sizeof(SmuMetrics_t)); ++ ++ return ret; ++} ++ ++static int arcturus_get_current_activity_percent(struct smu_context *smu, ++ enum amd_pp_sensors sensor, ++ uint32_t *value) ++{ ++ SmuMetrics_t metrics; ++ int ret = 0; ++ ++ if (!value) ++ return -EINVAL; ++ ++ ret = arcturus_get_metrics_table(smu, &metrics); ++ if (ret) ++ return ret; ++ ++ switch (sensor) { ++ case AMDGPU_PP_SENSOR_GPU_LOAD: ++ *value = metrics.AverageGfxActivity; ++ break; ++ case AMDGPU_PP_SENSOR_MEM_LOAD: ++ *value = metrics.AverageUclkActivity; ++ break; ++ default: ++ pr_err("Invalid sensor for retrieving clock activity\n"); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static int arcturus_get_gpu_power(struct smu_context *smu, uint32_t *value) ++{ ++ SmuMetrics_t metrics; ++ int ret = 0; ++ ++ if (!value) ++ return -EINVAL; ++ ++ ret = arcturus_get_metrics_table(smu, &metrics); ++ if (ret) ++ return ret; ++ ++ *value = metrics.AverageSocketPower << 8; ++ ++ return 0; ++} ++ ++static int arcturus_thermal_get_temperature(struct smu_context *smu, ++ enum amd_pp_sensors sensor, ++ uint32_t *value) ++{ ++ SmuMetrics_t metrics; ++ int ret = 0; ++ ++ if (!value) ++ return -EINVAL; ++ ++ ret = arcturus_get_metrics_table(smu, &metrics); ++ if (ret) ++ return ret; ++ ++ switch (sensor) { ++ case AMDGPU_PP_SENSOR_HOTSPOT_TEMP: ++ *value = metrics.TemperatureHotspot * ++ SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; ++ break; ++ case AMDGPU_PP_SENSOR_EDGE_TEMP: ++ *value = metrics.TemperatureEdge * ++ SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; ++ break; ++ case AMDGPU_PP_SENSOR_MEM_TEMP: ++ *value = metrics.TemperatureHBM * ++ SMU_TEMPERATURE_UNITS_PER_CENTIGRADES; ++ break; ++ default: ++ pr_err("Invalid sensor for retrieving temp\n"); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++static int arcturus_read_sensor(struct smu_context *smu, ++ enum amd_pp_sensors sensor, ++ void *data, uint32_t *size) ++{ ++ struct smu_table_context *table_context = &smu->smu_table; ++ PPTable_t *pptable = table_context->driver_pptable; ++ int ret = 0; ++ ++ switch (sensor) { ++ case AMDGPU_PP_SENSOR_MAX_FAN_RPM: ++ *(uint32_t *)data = pptable->FanMaximumRpm; ++ *size = 4; ++ break; ++ case AMDGPU_PP_SENSOR_MEM_LOAD: ++ case AMDGPU_PP_SENSOR_GPU_LOAD: ++ ret = arcturus_get_current_activity_percent(smu, ++ sensor, ++ (uint32_t *)data); ++ *size = 4; ++ break; ++ case AMDGPU_PP_SENSOR_GPU_POWER: ++ ret = arcturus_get_gpu_power(smu, (uint32_t *)data); ++ *size = 4; ++ break; ++ case AMDGPU_PP_SENSOR_HOTSPOT_TEMP: ++ case AMDGPU_PP_SENSOR_EDGE_TEMP: ++ case AMDGPU_PP_SENSOR_MEM_TEMP: ++ ret = arcturus_thermal_get_temperature(smu, sensor, ++ (uint32_t *)data); ++ *size = 4; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ return ret; ++} ++ + static void arcturus_dump_pptable(struct smu_context *smu) + { + struct smu_table_context *table_context = &smu->smu_table; +@@ -1309,6 +1450,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { + .get_thermal_temperature_range = arcturus_get_thermal_temperature_range, + .print_clk_levels = arcturus_print_clk_levels, + .force_clk_levels = arcturus_force_clk_levels, ++ .read_sensor = arcturus_read_sensor, + /* debug (internal used) */ + .dump_pptable = arcturus_dump_pptable, + }; +-- +2.17.1 + |