]> Pileus Git - ~andy/linux/commitdiff
drm/nouveau/pm: do not stop reclocking if failing to set the fan speed
authorMartin Peres <martin.peres@labri.fr>
Wed, 3 Oct 2012 23:00:13 +0000 (01:00 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 16 Oct 2012 06:29:02 +0000 (16:29 +1000)
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>
drivers/gpu/drm/nouveau/nouveau_pm.c

index 75314a1befc60a26cc3a34390dedfe55e6c19ff3..112d0deeb6d54547e6cb57f5bbf4adae28cabd54 100644 (file)
@@ -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;
                }
        }