diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2383-drm-amd-powerplay-move-function-thermal_get_temperat.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2383-drm-amd-powerplay-move-function-thermal_get_temperat.patch | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2383-drm-amd-powerplay-move-function-thermal_get_temperat.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2383-drm-amd-powerplay-move-function-thermal_get_temperat.patch new file mode 100644 index 00000000..3ddf87b1 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2383-drm-amd-powerplay-move-function-thermal_get_temperat.patch @@ -0,0 +1,110 @@ +From ed531abfb338ed2c97e2298808cc9885923b5213 Mon Sep 17 00:00:00 2001 +From: Kevin Wang <kevin1.wang@amd.com> +Date: Fri, 17 May 2019 14:12:51 +0800 +Subject: [PATCH 2383/2940] drm/amd/powerplay: move function + thermal_get_temperature to veag20_ppt + +the fcuntion thermal_get_temperature will be access SmuMetrics_t data, +the data structure is asic related, so move vega20_ppt to implement. + +Signed-off-by: Kevin Wang <kevin1.wang@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 7 ---- + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 48 ++++++++++++++++++++++ + 2 files changed, 48 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +index 538f52ab4b72..175463d9aa2d 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +@@ -1265,7 +1265,6 @@ static int smu_v11_0_thermal_get_temperature(struct smu_context *smu, + + return 0; + } +- + static uint16_t convert_to_vddc(uint8_t vid) + { + return (uint16_t) ((6200 - (vid * 25)) / SMU11_VOLTAGE_SCALE); +@@ -1304,12 +1303,6 @@ static int smu_v11_0_read_sensor(struct smu_context *smu, + ret = smu_get_current_clk_freq(smu, SMU_GFXCLK, (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 = smu_v11_0_thermal_get_temperature(smu, sensor, (uint32_t *)data); +- *size = 4; +- break; + case AMDGPU_PP_SENSOR_VDDGFX: + ret = smu_v11_0_get_gfx_vdd(smu, (uint32_t *)data); + *size = 4; +diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +index dd354a993bf1..625718cc8b63 100644 +--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c ++++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +@@ -3000,6 +3000,48 @@ static int vega20_get_current_activity_percent(struct smu_context *smu, + return 0; + } + ++static int vega20_thermal_get_temperature(struct smu_context *smu, ++ enum amd_pp_sensors sensor, ++ uint32_t *value) ++{ ++ struct amdgpu_device *adev = smu->adev; ++ SmuMetrics_t metrics; ++ uint32_t temp = 0; ++ int ret = 0; ++ ++ if (!value) ++ return -EINVAL; ++ ++ ret = vega20_get_metrics_table(smu, &metrics); ++ if (ret) ++ return ret; ++ ++ switch (sensor) { ++ case AMDGPU_PP_SENSOR_HOTSPOT_TEMP: ++ temp = RREG32_SOC15(THM, 0, mmCG_MULT_THERMAL_STATUS); ++ temp = (temp & CG_MULT_THERMAL_STATUS__CTF_TEMP_MASK) >> ++ CG_MULT_THERMAL_STATUS__CTF_TEMP__SHIFT; ++ ++ temp = temp & 0x1ff; ++ temp *= SMU11_TEMPERATURE_UNITS_PER_CENTIGRADES; ++ ++ *value = temp; ++ break; ++ case AMDGPU_PP_SENSOR_EDGE_TEMP: ++ *value = metrics.TemperatureEdge * ++ PP_TEMPERATURE_UNITS_PER_CENTIGRADES; ++ break; ++ case AMDGPU_PP_SENSOR_MEM_TEMP: ++ *value = metrics.TemperatureHBM * ++ PP_TEMPERATURE_UNITS_PER_CENTIGRADES; ++ break; ++ default: ++ pr_err("Invalid sensor for retrieving temp\n"); ++ return -EINVAL; ++ } ++ ++ return 0; ++} + static int vega20_read_sensor(struct smu_context *smu, + enum amd_pp_sensors sensor, + void *data, uint32_t *size) +@@ -3024,6 +3066,12 @@ static int vega20_read_sensor(struct smu_context *smu, + ret = vega20_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 = vega20_thermal_get_temperature(smu, sensor, (uint32_t *)data); ++ *size = 4; ++ break; + default: + return -EINVAL; + } +-- +2.17.1 + |