diff options
author | Hawking Zhang <Hawking.Zhang@amd.com> | 2016-12-01 17:14:45 +0800 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-12-06 18:08:33 -0500 |
commit | 10e2ca346bf74561ff1b7fff6287716ab976cd8c (patch) | |
tree | bd86ee6f909a5b5b49b222469e5c20c3f18d26f9 /drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | |
parent | 1cd99a8d97c90e04d526d843f2be950f6e4e3bd2 (diff) | |
download | linux-10e2ca346bf74561ff1b7fff6287716ab976cd8c.tar.gz linux-10e2ca346bf74561ff1b7fff6287716ab976cd8c.tar.bz2 linux-10e2ca346bf74561ff1b7fff6287716ab976cd8c.zip |
drm/amd/powerplay: bypass fan table setup if no fan connected
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.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c')
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c index 34523fe6ed6f..6aeb1d20cc3b 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c @@ -1958,6 +1958,12 @@ int fiji_thermal_setup_fan_table(struct pp_hwmgr *hwmgr) int 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); |