diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0933-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_static.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0933-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_static.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0933-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_static.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0933-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_static.patch deleted file mode 100644 index 07f0efa3..00000000 --- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0933-drm-amd-powerplay-Tidy-up-vega10_fan_ctrl_set_static.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c86c11a3f0f1e7af56a85c95f9f8940fb6ce724e Mon Sep 17 00:00:00 2001 -From: Tom St Denis <tom.stdenis@amd.com> -Date: Thu, 7 Sep 2017 12:20:48 -0400 -Subject: [PATCH 0933/4131] drm/amd/powerplay: Tidy up - vega10_fan_ctrl_set_static_mode() - -Signed-off-by: Tom St Denis <tom.stdenis@amd.com> -Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> ---- - .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 21 +++++++++------------ - 1 file changed, 9 insertions(+), 12 deletions(-) - -diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c -index f62b852..4e36403 100644 ---- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c -+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c -@@ -141,23 +141,20 @@ int vega10_fan_ctrl_set_static_mode(struct pp_hwmgr *hwmgr, uint32_t mode) - - if (hwmgr->fan_ctrl_is_in_default_mode) { - hwmgr->fan_ctrl_default_mode = -- (cgs_read_register(hwmgr->device, reg) & -- CG_FDO_CTRL2__FDO_PWM_MODE_MASK) >> -- CG_FDO_CTRL2__FDO_PWM_MODE__SHIFT; -- hwmgr->tmin = (cgs_read_register(hwmgr->device, reg) & -- CG_FDO_CTRL2__TMIN_MASK) >> -- CG_FDO_CTRL2__TMIN__SHIFT; -+ CGS_REG_GET_FIELD(cgs_read_register(hwmgr->device, reg), -+ CG_FDO_CTRL2, FDO_PWM_MODE); -+ hwmgr->tmin = -+ CGS_REG_GET_FIELD(cgs_read_register(hwmgr->device, reg), -+ CG_FDO_CTRL2, TMIN); - hwmgr->fan_ctrl_is_in_default_mode = false; - } - - cgs_write_register(hwmgr->device, reg, -- (cgs_read_register(hwmgr->device, reg) & -- ~CG_FDO_CTRL2__TMIN_MASK) | -- (0 << CG_FDO_CTRL2__TMIN__SHIFT)); -+ CGS_REG_SET_FIELD(cgs_read_register(hwmgr->device, reg), -+ CG_FDO_CTRL2, TMIN, 0)); - cgs_write_register(hwmgr->device, reg, -- (cgs_read_register(hwmgr->device, reg) & -- ~CG_FDO_CTRL2__FDO_PWM_MODE_MASK) | -- (mode << CG_FDO_CTRL2__FDO_PWM_MODE__SHIFT)); -+ CGS_REG_SET_FIELD(cgs_read_register(hwmgr->device, reg), -+ CG_FDO_CTRL2, FDO_PWM_MODE, mode)); - - return 0; - } --- -2.7.4 - |