diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0935-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_fan_sp.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0935-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_fan_sp.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0935-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_fan_sp.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0935-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_fan_sp.patch new file mode 100644 index 00000000..db01d536 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0935-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_fan_sp.patch @@ -0,0 +1,43 @@ +From a7ed22415311657f02c5ce4d9c908744d3ab92da Mon Sep 17 00:00:00 2001 +From: Tom St Denis <tom.stdenis@amd.com> +Date: Thu, 7 Sep 2017 12:41:51 -0400 +Subject: [PATCH 0935/4131] drm/amd/powerplay: Tidy up + vega10_fan_ctrl_set_fan_speed_percent() + +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 | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +index cda7fcf..7a25e22 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +@@ -281,9 +281,8 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr, + reg = soc15_get_register_offset(THM_HWID, 0, + mmCG_FDO_CTRL1_BASE_IDX, mmCG_FDO_CTRL1); + +- duty100 = (cgs_read_register(hwmgr->device, reg) & +- CG_FDO_CTRL1__FMAX_DUTY100_MASK) >> +- CG_FDO_CTRL1__FMAX_DUTY100__SHIFT; ++ duty100 = CGS_REG_GET_FIELD(cgs_read_register(hwmgr->device, reg), ++ CG_FDO_CTRL1, FMAX_DUTY100); + + if (duty100 == 0) + return -EINVAL; +@@ -295,9 +294,8 @@ int vega10_fan_ctrl_set_fan_speed_percent(struct pp_hwmgr *hwmgr, + reg = soc15_get_register_offset(THM_HWID, 0, + mmCG_FDO_CTRL0_BASE_IDX, mmCG_FDO_CTRL0); + cgs_write_register(hwmgr->device, reg, +- (cgs_read_register(hwmgr->device, reg) & +- ~CG_FDO_CTRL0__FDO_STATIC_DUTY_MASK) | +- (duty << CG_FDO_CTRL0__FDO_STATIC_DUTY__SHIFT)); ++ CGS_REG_SET_FIELD(cgs_read_register(hwmgr->device, reg), ++ CG_FDO_CTRL0, FDO_STATIC_DUTY, duty)); + + return vega10_fan_ctrl_set_static_mode(hwmgr, FDO_PWM_MODE_STATIC); + } +-- +2.7.4 + |