Commit 4164743c authored by Francesco Marella's avatar Francesco Marella Committed by Ben Skeggs

drm/nv40: fix reading temp value

Signed-off-by: default avatarFrancesco Marella <fmarl@paranoici.org>
Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5e6a7443
...@@ -178,7 +178,7 @@ nouveau_nv40_sensor_setup(struct drm_device *dev) ...@@ -178,7 +178,7 @@ nouveau_nv40_sensor_setup(struct drm_device *dev)
msleep(5); msleep(5);
/* read */ /* read */
return nv_rd32(dev, 0x0015b4); return nv_rd32(dev, 0x0015b4) & 0x1fff;
} }
s16 s16
...@@ -197,7 +197,7 @@ nouveau_temp_get(struct drm_device *dev) ...@@ -197,7 +197,7 @@ nouveau_temp_get(struct drm_device *dev)
if (dev_priv->chipset >= 0x50) { if (dev_priv->chipset >= 0x50) {
core_temp = nv_rd32(dev, 0x20008); core_temp = nv_rd32(dev, 0x20008);
} else { } else {
core_temp = nv_rd32(dev, 0x0015b4); core_temp = nv_rd32(dev, 0x0015b4) & 0x1fff;
/* Setup the sensor if the temperature is 0 */ /* Setup the sensor if the temperature is 0 */
if (core_temp == 0) if (core_temp == 0)
core_temp = nouveau_nv40_sensor_setup(dev); core_temp = nouveau_nv40_sensor_setup(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment