aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0116-drm-amd-powerplay-Fix-a-bug-in-fan-control-setting-d.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0116-drm-amd-powerplay-Fix-a-bug-in-fan-control-setting-d.patch')
-rw-r--r--common/recipes-kernel/linux/files/0116-drm-amd-powerplay-Fix-a-bug-in-fan-control-setting-d.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0116-drm-amd-powerplay-Fix-a-bug-in-fan-control-setting-d.patch b/common/recipes-kernel/linux/files/0116-drm-amd-powerplay-Fix-a-bug-in-fan-control-setting-d.patch
new file mode 100644
index 00000000..7face117
--- /dev/null
+++ b/common/recipes-kernel/linux/files/0116-drm-amd-powerplay-Fix-a-bug-in-fan-control-setting-d.patch
@@ -0,0 +1,42 @@
+From de1acf4abcfe4f6b462671de21f72eccd72d592f Mon Sep 17 00:00:00 2001
+From: Eric Huang <JinHuiEric.Huang@amd.com>
+Date: Thu, 3 Dec 2015 15:13:46 -0500
+Subject: [PATCH 0116/1110] drm/amd/powerplay: Fix a bug in fan control setting
+ default mode for Tonga and Fiji.
+
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com>
+---
+ drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c | 2 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
+index 1b2eaa9..def57d0 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c
+@@ -141,7 +141,7 @@ int fiji_fan_ctrl_set_static_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
+ */
+ int fiji_fan_ctrl_set_default_mode(struct pp_hwmgr *hwmgr)
+ {
+- if (hwmgr->fan_ctrl_is_in_default_mode) {
++ if (!hwmgr->fan_ctrl_is_in_default_mode) {
+ PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
+ CG_FDO_CTRL2, FDO_PWM_MODE, hwmgr->fan_ctrl_default_mode);
+ PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
+diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
+index a315507..5da7586 100644
+--- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c
+@@ -129,7 +129,7 @@ int tonga_fan_ctrl_set_static_mode(struct pp_hwmgr *hwmgr, uint32_t mode)
+ */
+ int tonga_fan_ctrl_set_default_mode(struct pp_hwmgr *hwmgr)
+ {
+- if (hwmgr->fan_ctrl_is_in_default_mode) {
++ if (!hwmgr->fan_ctrl_is_in_default_mode) {
+ PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, CG_FDO_CTRL2, FDO_PWM_MODE, hwmgr->fan_ctrl_default_mode);
+ PHM_WRITE_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, CG_FDO_CTRL2, TMIN, hwmgr->tmin);
+ hwmgr->fan_ctrl_is_in_default_mode = true;
+--
+2.7.4
+