aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_perf.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-06-10 01:33:11 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-09-20 02:01:37 -0400
commit03ce8d9e63199fd5983129941a6694123b885753 (patch)
tree32f90d1b3b9b3ede6df01196ecd93750de924eb8 /drivers/gpu/drm/nouveau/nouveau_perf.c
parentda1dc4cfecdf314241cc5e0c5df1f66b4cc80cc7 (diff)
drm/nouveau/pm: some fermi chipsets still use volt 0x30
Fun, fun. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_perf.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_perf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c
index 18d1d995b53a..b0e995fdcbad 100644
--- a/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -146,16 +146,16 @@ nouveau_perf_voltage(struct drm_device *dev, struct bit_entry *P,
146 id = perflvl->volt_min; 146 id = perflvl->volt_min;
147 perflvl->volt_min = 0; 147 perflvl->volt_min = 0;
148 148
149 /* pre-fermi vbios stores the voltage level directly in the 149 /* boards using voltage table version <0x40 store the voltage
150 * perflvl entry as a multiple of 10mV 150 * level directly in the perflvl entry as a multiple of 10mV
151 */ 151 */
152 if (dev_priv->card_type < NV_C0) { 152 if (dev_priv->engine.pm.voltage.version < 0x40) {
153 perflvl->volt_min = id * 10000; 153 perflvl->volt_min = id * 10000;
154 perflvl->volt_max = perflvl->volt_min; 154 perflvl->volt_max = perflvl->volt_min;
155 return; 155 return;
156 } 156 }
157 157
158 /* from fermi onwards, the perflvl stores an index into yet another 158 /* on newer ones, the perflvl stores an index into yet another
159 * vbios table containing a min/max voltage value for the perflvl 159 * vbios table containing a min/max voltage value for the perflvl
160 */ 160 */
161 if (P->version != 2 || P->length < 34) { 161 if (P->version != 2 || P->length < 34) {