From 92d7578461955594739468558156bb14e69530bc Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 9 Feb 2012 15:25:25 +1000 Subject: [PATCH] --- yaml --- r: 293761 b: refs/heads/master c: 8b83d67c2e2b7e704e6923d00209b6e67f7bdb35 h: refs/heads/master i: 293759: fd942a967953c1a43c9b6ff50ab44106b202c7a5 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_perf.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1f8f8f359a90..5c3da795864a 100644 --- 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 index e64901509f90..69a528d106e6 100644 --- 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];