From: Rex Zhu Date: Fri, 5 Oct 2018 16:11:25 +0000 (+0800) Subject: drm/amdgpu: Always enable fan sensors for read X-Git-Tag: Ubuntu-5.0.0-8.9~1316^2~3^2~48 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a57ba84b149cfeca133ea11f253049eac5f9c1a9;p=mirror_ubuntu-disco-kernel.git drm/amdgpu: Always enable fan sensors for read don't need to set fan1_enable to read fan sensors. Reviewed-by: Alex Deucher Signed-off-by: Rex Zhu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index 68548fbdee09..94055a485e01 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -1179,11 +1179,6 @@ static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev, struct amdgpu_device *adev = dev_get_drvdata(dev); int err; u32 speed = 0; - u32 pwm_mode; - - pwm_mode = amdgpu_dpm_get_fan_control_mode(adev); - if (pwm_mode != AMD_FAN_CTRL_MANUAL) - return -ENODATA; /* Can't adjust fan when the card is off */ if ((adev->flags & AMD_IS_PX) && @@ -1246,11 +1241,6 @@ static ssize_t amdgpu_hwmon_get_fan1_target(struct device *dev, struct amdgpu_device *adev = dev_get_drvdata(dev); int err; u32 rpm = 0; - u32 pwm_mode; - - pwm_mode = amdgpu_dpm_get_fan_control_mode(adev); - if (pwm_mode != AMD_FAN_CTRL_MANUAL) - return -ENODATA; /* Can't adjust fan when the card is off */ if ((adev->flags & AMD_IS_PX) &&