Skip to content

Commit

Permalink
drm/nv40: fix reading temp value
Browse files Browse the repository at this point in the history
Signed-off-by: Francesco Marella <fmarl@paranoici.org>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Francesco Marella authored and Ben Skeggs committed Sep 24, 2010
1 parent 5e6a744 commit 4164743
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/nouveau/nouveau_temp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down

0 comments on commit 4164743

Please sign in to comment.