aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-10-04 01:27:58 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-10-04 19:59:39 -0400
commitca8e7c6ccdfb9a77de9b9719e6ef768373fb607c (patch)
tree36e15125330e787bbb587d99f1b01cde8e22fb41 /drivers
parenteadc69cc9054594ff7860d407f855536af13af99 (diff)
drm/nouveau: parse voltage from perf 0x40 entires
This was disabled previously because of some uncertainty that +2 was indeed the voltage. It appears it is, checked on a NVA8 and a NVA3M. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_perf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c
index 3be875f1d983..ac62a1b8c4fc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -173,7 +173,7 @@ nouveau_perf_init(struct drm_device *dev)
173 case 0x40: 173 case 0x40:
174#define subent(n) entry[perf[2] + ((n) * perf[3])] 174#define subent(n) entry[perf[2] + ((n) * perf[3])]
175 perflvl->fanspeed = 0; /*XXX*/ 175 perflvl->fanspeed = 0; /*XXX*/
176 perflvl->voltage = 0; /*XXX: entry[2] */; 176 perflvl->voltage = entry[2];
177 perflvl->core = (ROM16(subent(0)) & 0xfff) * 1000; 177 perflvl->core = (ROM16(subent(0)) & 0xfff) * 1000;
178 perflvl->shader = (ROM16(subent(1)) & 0xfff) * 1000; 178 perflvl->shader = (ROM16(subent(1)) & 0xfff) * 1000;
179 perflvl->memory = (ROM16(subent(2)) & 0xfff) * 1000; 179 perflvl->memory = (ROM16(subent(2)) & 0xfff) * 1000;