diff options
| author | Ben Skeggs | 2011-09-16 18:01:24 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2011-12-21 10:01:12 +0100 |
| commit | 5a4267ab14b392bdf43893c6175b045b5f85d53d (patch) | |
| tree | cb6fb743da16b420e11b310687e21ea4e681a531 /drivers/gpu/drm/nouveau/nouveau_state.c | |
| parent | drm/nouveau/pm: introduce generic handler for on-chip fan controller (diff) | |
| download | kernel-qcow2-linux-5a4267ab14b392bdf43893c6175b045b5f85d53d.tar.gz kernel-qcow2-linux-5a4267ab14b392bdf43893c6175b045b5f85d53d.tar.xz kernel-qcow2-linux-5a4267ab14b392bdf43893c6175b045b5f85d53d.zip | |
drm/nv50/pm: convert to new fanspeed pwm controller hooks
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 16195e9a9f91..2028a393a900 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -386,8 +386,8 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) engine->pm.temp_get = nv84_temp_get; else engine->pm.temp_get = nv40_temp_get; - engine->pm.fanspeed_get = nv50_pm_fanspeed_get; - engine->pm.fanspeed_set = nv50_pm_fanspeed_set; + engine->pm.pwm_get = nv50_pm_pwm_get; + engine->pm.pwm_set = nv50_pm_pwm_set; engine->vram.init = nv50_vram_init; engine->vram.takedown = nv50_vram_fini; engine->vram.get = nv50_vram_new; @@ -443,8 +443,8 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) engine->pm.clocks_get = nvc0_pm_clocks_get; engine->pm.voltage_get = nouveau_voltage_gpio_get; engine->pm.voltage_set = nouveau_voltage_gpio_set; - engine->pm.fanspeed_get = nv50_pm_fanspeed_get; - engine->pm.fanspeed_set = nv50_pm_fanspeed_set; + engine->pm.pwm_get = nv50_pm_pwm_get; + engine->pm.pwm_set = nv50_pm_pwm_set; break; case 0xd0: engine->instmem.init = nvc0_instmem_init; |