Patch "drm/amd/powerplay: bypass fan table setup if no fan connected" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/amd/powerplay: bypass fan table setup if no fan connected
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-powerplay-bypass-fan-table-setup-if-no-fan-connected.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
10e2ca346bf74561ff1b7fff6287716ab976cd8cMon Sep 17 00:00:00 2001
From: Hawking Zhang <[email protected]>
Date: Thu, 1 Dec 2016 17:14:45 +0800
Subject: drm/amd/powerplay: bypass fan table setup if no fan connected
From: Hawking Zhang <[email protected]>
commit 10e2ca346bf74561ff1b7fff6287716ab976cd8c upstream.
If vBIOS noFan bit is set, the fan table parameters in thermal controller will not get initialized. The driver should avoid to use these uninitialized parameter to do calculation. Otherwise, it may trigger divide 0 error.
--- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 ++++++ drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 6 ++++++ drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 6 ++++++ drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 6 ++++++ 4 files changed, 24 insertions(+)
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +6 -0
@@ -1958,6 +1958,12 @@ int fiji_thermal_setup_fan_table(structint res;uint64_t tmp64; +if (hwmgr->thermal_controller.fanInfo.bNoFan) { +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl); +return 0 ; + } +if (smu_data->smu7_data.fan_table_start ==0 ) {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c +6 -0
@@ -2006,6 +2006,12 @@ int iceland_thermal_setup_fan_table(struif (!phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl))return 0 ; +if (hwmgr->thermal_controller.fanInfo.bNoFan) { +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl); +return 0 ; + } +if (0 == smu7_data->fan_table_start) {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);return 0 ;
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +6 -0
@@ -1885,6 +1885,12 @@ int polaris10_thermal_setup_fan_table(stint res;uint64_t tmp64; +if (hwmgr->thermal_controller.fanInfo.bNoFan) { +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl); +return 0 ; + } +if (smu_data->smu7_data.fan_table_start ==0 ) {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c +6 -0
@@ -2496,6 +2496,12 @@ int tonga_thermal_setup_fan_table(struct PHM_PlatformCaps_MicrocodeFanControl))return 0 ; +if (hwmgr->thermal_controller.fanInfo.bNoFan) { +phm_cap_unset (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl); +return 0 ; + } +if (0 == smu_data->smu7_data.fan_table_start) {phm_cap_unset (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/drm-amd-powerplay-bypass-fan-table-setup-if-no-fan-connected.patch