diff options
| author | Martin Peres <martin.peres@labri.fr> | 2012-09-04 13:52:00 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:13:15 +1000 |
| commit | 2f951a5db5b55f65eb02d9a90aa7cecafde9f8b8 (patch) | |
| tree | 9aeaca54de7a14598a3b2be04cb13ab891863dfd /drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c | |
| parent | c9cbf135065c0a674d43451127a10e48a53f9054 (diff) | |
| download | op-kernel-dev-2f951a5db5b55f65eb02d9a90aa7cecafde9f8b8.zip op-kernel-dev-2f951a5db5b55f65eb02d9a90aa7cecafde9f8b8.tar.gz | |
drm/nouveau/therm: add support for fan-control modes
For now, only 2 control modes are available:
- NONE: The fan is never touched (default)
- MANUAL: The fan is set to the user-defined fan speed (pwm1)
This patch introduces a distinction between ptherm internal fan management
and external fan management. The latter is bound to respect the fan mode
while the first can still select the speed it wants unless the NONE mode
is selected. This is important for automatic fan management.
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c index de7dc20..f87a7a3 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c @@ -136,8 +136,8 @@ nv50_therm_ctor(struct nouveau_object *parent, priv->fan.pwm_clock = nv50_fan_pwm_clock; therm->temp_get = nv50_temp_get; - therm->fan_get = nouveau_therm_fan_get; - therm->fan_set = nouveau_therm_fan_set; + therm->fan_get = nouveau_therm_fan_user_get; + therm->fan_set = nouveau_therm_fan_user_set; therm->fan_sense = nouveau_therm_fan_sense; therm->attr_get = nouveau_therm_attr_get; therm->attr_set = nouveau_therm_attr_set; |
