aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2015-02-04 17:18:55 -0500
committerAlex Deucher <alexander.deucher@amd.com>2015-02-11 12:01:33 -0500
commit082452e125fe27a9f43add2269dfa2341fb71d30 (patch)
tree43a6eeeabd3d0f93b8726c6ffaaa6b344192bdda /drivers/gpu
parent85840c76d8ad18d978da44e8d2f27bb35b7159af (diff)
drm/radeon: use 0-255 rather than 0-100 for pwm fan range
0-255 seems to be the preferred range for the pwm interface. Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon_pm.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 91e1bd246cad..9f758d39420d 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -585,7 +585,7 @@ static ssize_t radeon_hwmon_set_pwm1_enable(struct device *dev,
585 if (err) 585 if (err)
586 return err; 586 return err;
587 587
588 switch(value) { 588 switch (value) {
589 case 1: /* manual, percent-based */ 589 case 1: /* manual, percent-based */
590 rdev->asic->dpm.fan_ctrl_set_mode(rdev, FDO_PWM_MODE_STATIC); 590 rdev->asic->dpm.fan_ctrl_set_mode(rdev, FDO_PWM_MODE_STATIC);
591 break; 591 break;
@@ -608,7 +608,7 @@ static ssize_t radeon_hwmon_get_pwm1_max(struct device *dev,
608 struct device_attribute *attr, 608 struct device_attribute *attr,
609 char *buf) 609 char *buf)
610{ 610{
611 return sprintf(buf, "%i\n", 100); /* pwm uses percent-based fan-control */ 611 return sprintf(buf, "%i\n", 255);
612} 612}
613 613
614static ssize_t radeon_hwmon_set_pwm1(struct device *dev, 614static ssize_t radeon_hwmon_set_pwm1(struct device *dev,
@@ -623,6 +623,8 @@ static ssize_t radeon_hwmon_set_pwm1(struct device *dev,
623 if (err) 623 if (err)
624 return err; 624 return err;
625 625
626 value = (value * 100) / 255;
627
626 err = rdev->asic->dpm.set_fan_speed_percent(rdev, value); 628 err = rdev->asic->dpm.set_fan_speed_percent(rdev, value);
627 if (err) 629 if (err)
628 return err; 630 return err;
@@ -642,6 +644,8 @@ static ssize_t radeon_hwmon_get_pwm1(struct device *dev,
642 if (err) 644 if (err)
643 return err; 645 return err;
644 646
647 speed = (speed * 255) / 100;
648
645 return sprintf(buf, "%i\n", speed); 649 return sprintf(buf, "%i\n", speed);
646} 650}
647 651