summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMartin Peres <martin.peres@labri.fr>2013-03-15 00:42:38 +0100
committerBen Skeggs <bskeggs@redhat.com>2013-03-18 11:15:27 +1000
commitbf55eb843d266ad31696f17cf1f5c237409485cf (patch)
treec1b435d06e9a75c6fb5a06c5e85fdb11aa8751ea /drivers/gpu
parent98ee7c7c63f16e443f51abf08e5412f8eb44ad1e (diff)
downloadlinux-3.10-bf55eb843d266ad31696f17cf1f5c237409485cf.tar.gz
linux-3.10-bf55eb843d266ad31696f17cf1f5c237409485cf.tar.bz2
linux-3.10-bf55eb843d266ad31696f17cf1f5c237409485cf.zip
drm/nouveau/therm: disable temperature management if the sensor isn't readable
Signed-off-by: Martin Peres <martin.peres@labri.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/therm/temp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
index 0d94d1a19eb..2a02c9f1d7f 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
@@ -193,7 +193,7 @@ alarm_timer_callback(struct nouveau_alarm *alarm)
NOUVEAU_THERM_THRS_SHUTDOWN);
/* schedule the next poll in one second */
- if (list_empty(&alarm->head))
+ if (therm->temp_get(therm) >= 0 && list_empty(&alarm->head))
ptimer->alarm(ptimer, 1000 * 1000 * 1000, alarm);
spin_unlock_irqrestore(&priv->sensor.alarm_program_lock, flags);