---

yaml --- r: 218247 b: refs/heads/master c: ca8e7c6 h: refs/heads/master i: 218245: 3e58db0 218243: 736285b 218239: c45a196 v: v3
git-mirror · Oct 4, 2010 · 83b182f · 83b182f
1 parent 3aafcba
commit 83b182f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eadc69cc9054594ff7860d407f855536af13af99
+refs/heads/master: ca8e7c6ccdfb9a77de9b9719e6ef768373fb607c
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -173,7 +173,7 @@ nouveau_perf_init(struct drm_device *dev)
 		case 0x40:
 #define subent(n) entry[perf[2] + ((n) * perf[3])]
 			perflvl->fanspeed = 0; /*XXX*/
-			perflvl->voltage = 0; /*XXX: entry[2] */;
+			perflvl->voltage = entry[2];
 			perflvl->core = (ROM16(subent(0)) & 0xfff) * 1000;
 			perflvl->shader = (ROM16(subent(1)) & 0xfff) * 1000;
 			perflvl->memory = (ROM16(subent(2)) & 0xfff) * 1000;