diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-02-09 15:25:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-03-13 17:14:59 +1000 |
| commit | 8b83d67c2e2b7e704e6923d00209b6e67f7bdb35 (patch) | |
| tree | 25b34a35f14b8671e2ce4d5fe2123be4b9716f62 /drivers/gpu/drm/nouveau | |
| parent | e6084257d07fffc394ac6e4cf4496c946fd904ed (diff) | |
| download | blackbird-op-linux-8b83d67c2e2b7e704e6923d00209b6e67f7bdb35.tar.gz blackbird-op-linux-8b83d67c2e2b7e704e6923d00209b6e67f7bdb35.zip | |
drm/nv40/pm: fix fanspeed regression
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_perf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index e64901509f90..69a528d106e6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -300,6 +300,10 @@ nouveau_perf_init(struct drm_device *dev) return; } + perf = nouveau_perf_table(dev, &ver); + if (ver >= 0x20 && ver < 0x40) + pm->fan.pwm_divisor = ROM16(perf[6]); + while ((perf = nouveau_perf_entry(dev, ++i, &ver, &hdr, &cnt, &len))) { struct nouveau_pm_level *perflvl = &pm->perflvl[pm->nr_perflvl]; |
