Emil Velikov
2011-Aug-04 18:22 UTC
[Nouveau] [PATCH] drm/nv41/pm: Write to correct registers on nv41_fan_set()
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com> --- drivers/gpu/drm/nouveau/nv40_pm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c index c5ad31c..aa9fded 100644 --- a/drivers/gpu/drm/nouveau/nv40_pm.c +++ b/drivers/gpu/drm/nouveau/nv40_pm.c @@ -380,7 +380,7 @@ nv41_pm_fanspeed_set(struct drm_device *dev, int percent) u32 divs = pm->pwm_divisor; u32 duty = ((100 - percent) * divs) / 100; - nv_wr32(dev, 0x0010f8, divs); - nv_wr32(dev, 0x0010f4, duty | 0x80000000); + nv_wr32(dev, 0x0015f8, divs); + nv_wr32(dev, 0x0015f4, duty | 0x80000000); return 0; } -- 1.7.6
Ben Skeggs
2011-Aug-04 23:08 UTC
[Nouveau] [PATCH] drm/nv41/pm: Write to correct registers on nv41_fan_set()
On Thu, 2011-08-04 at 19:22 +0100, Emil Velikov wrote:> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com> > --- > drivers/gpu/drm/nouveau/nv40_pm.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-)Oops, copy+pasto probably. I just rebased nouveau git onto 3.0-final, and squashed the fix into the original commit. Ben.> > diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c > index c5ad31c..aa9fded 100644 > --- a/drivers/gpu/drm/nouveau/nv40_pm.c > +++ b/drivers/gpu/drm/nouveau/nv40_pm.c > @@ -380,7 +380,7 @@ nv41_pm_fanspeed_set(struct drm_device *dev, int percent) > u32 divs = pm->pwm_divisor; > u32 duty = ((100 - percent) * divs) / 100; > > - nv_wr32(dev, 0x0010f8, divs); > - nv_wr32(dev, 0x0010f4, duty | 0x80000000); > + nv_wr32(dev, 0x0015f8, divs); > + nv_wr32(dev, 0x0015f4, duty | 0x80000000); > return 0; > }