]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/nv40/pm: fix fanspeed regression
authorBen Skeggs <bskeggs@redhat.com>
Thu, 9 Feb 2012 05:25:25 +0000 (15:25 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Tue, 13 Mar 2012 07:14:59 +0000 (17:14 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_perf.c

index e64901509f90a9b64557bc3093811fb1304a8c16..69a528d106e6e7e7f3960b039eaf99d065072a9c 100644 (file)
@@ -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];