From: Alex Deucher Date: Sat, 19 Dec 2015 23:26:55 +0000 (-0500) Subject: amd/powerplay: don't enable ucode fan control if vbios has no fan table X-Git-Tag: Ubuntu-5.0.0-8.9~7987^2~19^2~2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=45b0cf54bc5da284afc86fad97e1c8b1bbe26d73;p=mirror_ubuntu-disco-kernel.git amd/powerplay: don't enable ucode fan control if vbios has no fan table Some systems have a single fan controlled by ACPI or some other method. Reviewed-by: Tom St Denis Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c index 5da758674a48..2e159b003e71 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c @@ -371,6 +371,9 @@ int tf_tonga_thermal_setup_fan_table(struct pp_hwmgr *hwmgr, void *input, void * int res; uint64_t tmp64; + if (!phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl)) + return 0; + if (0 == data->fan_table_start) { phm_cap_unset(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl); return 0;