diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0932-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_get_fan_sp.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0932-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_get_fan_sp.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0932-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_get_fan_sp.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0932-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_get_fan_sp.patch new file mode 100644 index 00000000..a6f9aee1 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0932-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_get_fan_sp.patch @@ -0,0 +1,40 @@ +From 31596d9a88fa5dbb9f88be16db7c1892460e13b8 Mon Sep 17 00:00:00 2001 +From: Tom St Denis <tom.stdenis@amd.com> +Date: Thu, 7 Sep 2017 10:36:40 -0400 +Subject: [PATCH 0932/4131] drm/amd/powerplay: Tidy up + vega10_fan_ctrl_get_fan_speed_rpm() + +Signed-off-by: Tom St Denis <tom.stdenis@amd.com> +Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +index eee143a..f62b852 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +@@ -104,14 +104,15 @@ int vega10_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *speed) + if (hwmgr->thermal_controller.fanInfo.bNoFan) + return -1; + +- if (data->smu_features[GNLD_FAN_CONTROL].supported) ++ if (data->smu_features[GNLD_FAN_CONTROL].supported) { + result = vega10_get_current_rpm(hwmgr, speed); +- else { ++ } else { + uint32_t reg = soc15_get_register_offset(THM_HWID, 0, + mmCG_TACH_STATUS_BASE_IDX, mmCG_TACH_STATUS); +- tach_period = (cgs_read_register(hwmgr->device, +- reg) & CG_TACH_STATUS__TACH_PERIOD_MASK) >> +- CG_TACH_STATUS__TACH_PERIOD__SHIFT; ++ tach_period = ++ CGS_REG_GET_FIELD(cgs_read_register(hwmgr->device, reg), ++ CG_TACH_STATUS, ++ TACH_PERIOD); + + if (tach_period == 0) + return -EINVAL; +-- +2.7.4 + |