]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/amd/powerplay: updated vega10 fan control
authorEvan Quan <evan.quan@amd.com>
Fri, 28 Jul 2017 07:01:14 +0000 (15:01 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 Aug 2017 18:45:51 +0000 (14:45 -0400)
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c

index e7ab8eb8a0cfae1c9b60c582a4cbee4b5b49e567..d44243441d284a80bc5abe398bf1bb9d0f3f875c 100644 (file)
@@ -321,10 +321,7 @@ int vega10_fan_ctrl_reset_fan_speed_to_default(struct pp_hwmgr *hwmgr)
 
        if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
                        PHM_PlatformCaps_MicrocodeFanControl)) {
-               result = vega10_fan_ctrl_set_static_mode(hwmgr,
-                               FDO_PWM_MODE_STATIC);
-               if (!result)
-                       result = vega10_fan_ctrl_start_smc_fan_control(hwmgr);
+               result = vega10_fan_ctrl_start_smc_fan_control(hwmgr);
        } else
                result = vega10_fan_ctrl_set_default_mode(hwmgr);
 
@@ -633,7 +630,6 @@ int tf_vega10_thermal_start_smc_fan_control(struct pp_hwmgr *hwmgr,
        if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
                        PHM_PlatformCaps_MicrocodeFanControl)) {
                vega10_fan_ctrl_start_smc_fan_control(hwmgr);
-               vega10_fan_ctrl_set_static_mode(hwmgr, FDO_PWM_MODE_STATIC);
        }
 
        return 0;