diff options
| author | Martin Peres <martin.peres@labri.fr> | 2012-10-04 01:00:13 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-16 16:29:02 +1000 |
| commit | eed6187d9f19535ac9339b684537f8535bf563b7 (patch) | |
| tree | 716843bafd786afe64e589e5bc16c693a01eafca /drivers/gpu/drm/nouveau | |
| parent | a6fd5cf3c986dab3950185a53ef02a399bf2cf2b (diff) | |
| download | blackbird-op-linux-eed6187d9f19535ac9339b684537f8535bf563b7.tar.gz blackbird-op-linux-eed6187d9f19535ac9339b684537f8535bf563b7.zip | |
drm/nouveau/pm: do not stop reclocking if failing to set the fan speed
With the introduction of fan management modes, fan may not be drivable.
We should allow reclocking nonetheless.
This return was stupid to begin with since it may have left the card
in an intermediate state (clocks corresponding to a perflvl and voltage
corresponding to another one). The reclocking code will need to be
rewritten in a near-future in order to provide a better error handling.
Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 75314a1befc6..112d0deeb6d5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -64,7 +64,6 @@ nouveau_pm_perflvl_aux(struct drm_device *dev, struct nouveau_pm_level *perflvl, ret = therm->fan_set(therm, perflvl->fanspeed); if (ret && ret != -ENODEV) { NV_ERROR(drm, "fanspeed set failed: %d\n", ret); - return ret; } } |
