From 83b182fd8c3abd92e8334d7796cd4e726010c2b3 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 4 Oct 2010 15:27:58 +1000 Subject: [PATCH] --- yaml --- r: 218247 b: refs/heads/master c: ca8e7c6ccdfb9a77de9b9719e6ef768373fb607c h: refs/heads/master i: 218245: 3e58db046d7fa49606f68f25c606c500370f651d 218243: 736285b927b7db8eda8915de255d1c3f0c203bb9 218239: c45a196f719555f1532026c2495dfb5bc84a1dbe v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_perf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ace38a3a760..31692535d08a 100644 --- 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 index 3be875f1d983..ac62a1b8c4fc 100644 --- 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;