diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-08-15 16:13:34 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:11 +1000 |
| commit | 3f8e11e4b606a050007cd1020d59e7b74c68d088 (patch) | |
| tree | 4d550be304e3229af2228bcd9469f34057395dbb /drivers/gpu/drm/nouveau/nouveau_perf.c | |
| parent | 11b7d895216f7f954c6cfa0c23b76dccb7a890c1 (diff) | |
| download | blackbird-op-linux-3f8e11e4b606a050007cd1020d59e7b74c68d088.tar.gz blackbird-op-linux-3f8e11e4b606a050007cd1020d59e7b74c68d088.zip | |
drm/nv50/pm: mostly nailed down fan pwm frequency selection
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.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 3d20dca08fe8..6ea57c91162b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -206,13 +206,12 @@ nouveau_perf_init(struct drm_device *dev) if (version < 0x40) { recordlen = perf[3] + (perf[4] * perf[5]); entries = perf[2]; + + pm->pwm_divisor = ROM16(perf[6]); } else { recordlen = perf[2] + (perf[3] * perf[4]); entries = perf[5]; } - - if (version < 0x30) - pm->pwm_divisor = ROM16(perf[6]); } else { if (bios->data[bios->offset + 6] < 0x25) { legacy_perf_init(dev); |
