diff options
| author | Francisco Jerez | 2010-09-23 20:58:38 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2010-09-24 08:29:29 +0200 |
| commit | 8155cac489eb8cc6fd96b9bdefacdf5a56e6ea32 (patch) | |
| tree | 0fb54eb113e8cbac73836b9c48989f0bf42d4f2f /drivers/gpu/drm/nouveau/nouveau_state.c | |
| parent | drm/nouveau: Double the perf table memory clocks on pre-G71 cards. (diff) | |
| download | kernel-qcow2-linux-8155cac489eb8cc6fd96b9bdefacdf5a56e6ea32.tar.gz kernel-qcow2-linux-8155cac489eb8cc6fd96b9bdefacdf5a56e6ea32.tar.xz kernel-qcow2-linux-8155cac489eb8cc6fd96b9bdefacdf5a56e6ea32.zip | |
drm/nouveau: Refactor nouveau_temp_get() into engine pointers.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index f9f77de6bbc0..affcfc2fae19 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -320,6 +320,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) engine->pm.clock_set = nv04_pm_clock_set; engine->pm.voltage_get = nouveau_voltage_gpio_get; engine->pm.voltage_set = nouveau_voltage_gpio_set; + engine->pm.temp_get = nv40_temp_get; break; case 0x50: case 0x80: /* gotta love NVIDIA's consistency.. */ @@ -379,6 +380,10 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) engine->pm.clock_set = nv50_pm_clock_set; engine->pm.voltage_get = nouveau_voltage_gpio_get; engine->pm.voltage_set = nouveau_voltage_gpio_set; + if (dev_priv->chipset >= 0x84) + engine->pm.temp_get = nv84_temp_get; + else + engine->pm.temp_get = nv40_temp_get; break; case 0xC0: engine->instmem.init = nvc0_instmem_init; |