summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2013-08-12 02:48:48 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2013-09-04 03:46:32 (GMT)
commitffb8ea8af20d88ed8b314be62a77b992055d10c8 (patch)
tree38ffd041ecfb360cd9cd16a9b545df321f3897cb
parentbd9c5a2016307164c419c5e24a46921c10e620a0 (diff)
downloadlinux-ffb8ea8af20d88ed8b314be62a77b992055d10c8.tar.xz
drm/nouveau/therm: Set the correct pwm_mode upon resume
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Signed-off-by: Martin Peres <martin.peres@labri.fr> Tested-by: Martin Peres <martin.peres@labri.fr> Tested-by: Dash Four <mr.dash.four@googlemail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/therm/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
index a00a5a7..3e9d941 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
@@ -268,7 +268,7 @@ _nouveau_therm_init(struct nouveau_object *object)
return ret;
if (priv->suspend >= 0)
- nouveau_therm_fan_mode(therm, priv->mode);
+ nouveau_therm_fan_mode(therm, priv->suspend);
priv->sensor.program_alarms(therm);
return 0;
}