lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nvc0/therm: allow fan control if we've killed the vbios ppwr ucode

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2013-10-15 10:31:05 +10:00
parent 36faa2fc22
commit 09b8d73bd5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/nouveau/core/subdev/therm/base.c
View File

@@ -168,14 +168,15 @@ nouveau_therm_fan_mode(struct nouveau_therm *therm, int mode)
"automatic" "automatic"
}; };
/* The default PDAEMON ucode interferes with fan management */ /* The default PPWR ucode on fermi interferes with fan management */
if ((mode >= ARRAY_SIZE(name)) || if ((mode >= ARRAY_SIZE(name)) ||
(mode != NOUVEAU_THERM_CTRL_NONE && device->card_type >= NV_C0)) (mode != NOUVEAU_THERM_CTRL_NONE && device->card_type >= NV_C0 &&
!nouveau_subdev(device, NVDEV_SUBDEV_PWR)))
return -EINVAL; return -EINVAL;
/* do not allow automatic fan management if the thermal sensor is /* do not allow automatic fan management if the thermal sensor is
* not available */ * not available */
if (priv->mode == 2 && therm->temp_get(therm) < 0) if (priv->mode == NOUVEAU_THERM_CTRL_AUTO && therm->temp_get(therm) < 0)
return -EINVAL; return -EINVAL;
if (priv->mode == mode) if (priv->mode == mode)