diff options
| author |   Martin Peres <martin.peres@labri.fr> | 2014-02-19 01:04:56 +0100 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2014-03-26 14:08:25 +1000 |
| commit | 0e994d645627bb67088ae4860e9a0295b123f7b0 (patch) | |
| tree | d5a71622d95557e7fe8f84ca4b461a6b0c09a909 /drivers/gpu/drm/nouveau/core/subdev/therm/base.c | |
| parent | drm/nvd7/therm: handle another kind of PWM fans (diff) | |
| download | linux-dev-0e994d645627bb67088ae4860e9a0295b123f7b0.tar.xz linux-dev-0e994d645627bb67088ae4860e9a0295b123f7b0.zip | |
drm/nouveau/therm: let the vbios decide on the automatic fan management mode
This should fix automatic fan management on fermi cards who do not have
0x46 entries in the thermal table.
On my nve6, the blob sets the default linear range from 40°C to 100°C
but my nvcf's default values are 40°C to 85°C. Let's keep 85 as a default
for everyone.
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Tested-by: Timothée Ravier <tim@siosm.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/therm/base.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/therm/base.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c index fd1b4606e22b..9ad01da6eacb 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c @@ -110,16 +110,18 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode) poll = false; break; case NOUVEAU_THERM_CTRL_AUTO: - if (priv->fan->bios.nr_fan_trip) { + switch(priv->fan->bios.fan_mode) { + case NVBIOS_THERM_FAN_TRIP: duty = nouveau_therm_update_trip(therm); - } else - if (priv->fan->bios.linear_min_temp || - priv->fan->bios.linear_max_temp) { + break; + case NVBIOS_THERM_FAN_LINEAR: duty = nouveau_therm_update_linear(therm); - } else { + break; + case NVBIOS_THERM_FAN_OTHER: if (priv->cstate) duty = priv->cstate; poll = false; + break; } immd = false; break; |