---

yaml --- r: 293761 b: refs/heads/master c: 8b83d67 h: refs/heads/master i: 293759: fd942a9 v: v3
git-mirror · Mar 13, 2012 · 92d7578 · 92d7578
1 parent b09694c
commit 92d7578
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6084257d07fffc394ac6e4cf4496c946fd904ed
+refs/heads/master: 8b83d67c2e2b7e704e6923d00209b6e67f7bdb35
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c b/trunk/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];