From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 9 Feb 2012 05:25:25 +0000 (+1000)
Subject: drm/nv40/pm: fix fanspeed regression
X-Git-Tag: v3.4-rc1~143^2~61^2~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b83d67c2e2b7e704e6923d00209b6e67f7bdb35;p=karo-tx-linux.git

drm/nv40/pm: fix fanspeed regression

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

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];