diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/1415-drm-amd-powerplay-implement-sensor-of-get_gfx_vdd-fo.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/1415-drm-amd-powerplay-implement-sensor-of-get_gfx_vdd-fo.patch | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/1415-drm-amd-powerplay-implement-sensor-of-get_gfx_vdd-fo.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/1415-drm-amd-powerplay-implement-sensor-of-get_gfx_vdd-fo.patch new file mode 100644 index 00000000..692cb4b9 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/1415-drm-amd-powerplay-implement-sensor-of-get_gfx_vdd-fo.patch @@ -0,0 +1,95 @@ +From 45a28dc94e970a0db450bb7d75c9f497ae6f0aa1 Mon Sep 17 00:00:00 2001 +From: Kevin Wang <Kevin1.Wang@amd.com> +Date: Wed, 16 Jan 2019 13:31:12 +0800 +Subject: [PATCH 1415/2940] drm/amd/powerplay: implement sensor of get_gfx_vdd + for smu11 + +add sensor interface of gfx vdd for hwmon + +Signed-off-by: Kevin Wang <Kevin1.Wang@amd.com> +Reviewed-by: Huang Rui <ray.huang@amd.com> +Reviewed-by: Evan Quan <evan.quan@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 31 ++++++++++++++++++++++ + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 1 + + 2 files changed, 32 insertions(+) + +diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +index e27ae9c63ff8..7c64509df8ab 100644 +--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c ++++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c +@@ -38,6 +38,8 @@ + #include "asic_reg/mp/mp_9_0_offset.h" + #include "asic_reg/mp/mp_9_0_sh_mask.h" + #include "asic_reg/nbio/nbio_7_4_offset.h" ++#include "asic_reg/smuio/smuio_9_0_offset.h" ++#include "asic_reg/smuio/smuio_9_0_sh_mask.h" + + MODULE_FIRMWARE("amdgpu/vega20_smc.bin"); + +@@ -46,6 +48,7 @@ MODULE_FIRMWARE("amdgpu/vega20_smc.bin"); + #define SMU11_THERMAL_MAXIMUM_ALERT_TEMP 255 + + #define SMU11_TEMPERATURE_UNITS_PER_CENTIGRADES 1000 ++#define SMU11_VOLTAGE_SCALE 4 + + static int smu_v11_0_send_msg_without_waiting(struct smu_context *smu, + uint16_t msg) +@@ -1049,6 +1052,30 @@ static int smu_v11_0_get_gpu_power(struct smu_context *smu, uint32_t *value) + return 0; + } + ++static uint16_t convert_to_vddc(uint8_t vid) ++{ ++ return (uint16_t) ((6200 - (vid * 25)) / SMU11_VOLTAGE_SCALE); ++} ++ ++static int smu_v11_0_get_gfx_vdd(struct smu_context *smu, uint32_t *value) ++{ ++ struct amdgpu_device *adev = smu->adev; ++ uint32_t vdd = 0, val_vid = 0; ++ ++ if (!value) ++ return -EINVAL; ++ val_vid = (RREG32_SOC15(SMUIO, 0, mmSMUSVI0_TEL_PLANE0) & ++ SMUSVI0_TEL_PLANE0__SVI0_PLANE0_VDDCOR_MASK) >> ++ SMUSVI0_TEL_PLANE0__SVI0_PLANE0_VDDCOR__SHIFT; ++ ++ vdd = (uint32_t)convert_to_vddc((uint8_t)val_vid); ++ ++ *value = vdd; ++ ++ return 0; ++ ++} ++ + static int smu_v11_0_read_sensor(struct smu_context *smu, + enum amd_pp_sensors sensor, + void *data, uint32_t *size) +@@ -1076,6 +1103,10 @@ static int smu_v11_0_read_sensor(struct smu_context *smu, + ret = smu_v11_0_get_gpu_power(smu, (uint32_t *)data); + *size = 4; + break; ++ case AMDGPU_PP_SENSOR_VDDGFX: ++ ret = smu_v11_0_get_gfx_vdd(smu, (uint32_t *)data); ++ *size = 4; ++ break; + default: + ret = -EINVAL; + break; +diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.h b/drivers/gpu/drm/amd/powerplay/vega20_ppt.h +index 419dae34fa6b..ceba4f7dbab4 100644 +--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.h ++++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.h +@@ -28,6 +28,7 @@ + + #define MAX_REGULAR_DPM_NUMBER 16 + #define MAX_PCIE_CONF 2 ++ + struct vega20_dpm_level { + bool enabled; + uint32_t value; +-- +2.17.1 + |