drm/nv40: fix reading temp value

Signed-off-by: Francesco Marella <fmarl@paranoici.org>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c
index 3394075e4c3ceecf4944f370b1bbef3c8682177a..3e0f19e1c72f3d9943da37b18b70366a333f1ad0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -178,7 +178,7 @@ nouveau_nv40_sensor_setup(struct drm_device *dev)
        msleep(5);
 
        /* read */
-       return nv_rd32(dev, 0x0015b4);
+       return nv_rd32(dev, 0x0015b4) & 0x1fff;
 }
 
 s16
@@ -197,7 +197,7 @@ nouveau_temp_get(struct drm_device *dev)
                if (dev_priv->chipset >= 0x50) {
                        core_temp = nv_rd32(dev, 0x20008);
                } else {
-                       core_temp = nv_rd32(dev, 0x0015b4);
+                       core_temp = nv_rd32(dev, 0x0015b4) & 0x1fff;
                        /* Setup the sensor if the temperature is 0 */
                        if (core_temp == 0)
                                core_temp = nouveau_nv40_sensor_setup(dev);