---

yaml --- r: 218220 b: refs/heads/master c: 4164743 h: refs/heads/master v: v3
git-mirror · Sep 24, 2010 · 62d915d · 62d915d
1 parent 215eefc
commit 62d915d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e6a74436e378eb021a74f3e5f329eecf49d928e
+refs/heads/master: 4164743c8249ef2867cf71ae2cb2380b5a550b06
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_temp.c b/trunk/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);