aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_pm.c
diff options
context:
space:
mode:
authorMartin Peres <martin.peres@labri.fr>2012-08-16 05:00:55 -0400
committerBen Skeggs <bskeggs@redhat.com>2012-10-02 23:13:13 -0400
commit7d70e9c1c69a5d22588ff5977249ac944d7cdfb0 (patch)
tree98a34b0cd7568d2a9b0faa0e857bba3e5b5dd84b /drivers/gpu/drm/nouveau/nouveau_pm.c
parente36199980b51f081671d76de7b7b8f94fe1e0ae3 (diff)
drm/nouveau/therm: rework thermal table parsing
As an accident, it should also fix temperature reading on nv4x. v2: introduce nvbios_therm_entry as advised by darktama Signed-off-by: Martin Peres <martin.peres@labri.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_pm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_pm.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index d2f2de67f688..bdd50953488c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -891,10 +891,7 @@ nouveau_pm_init(struct drm_device *dev)
891 } 891 }
892 pm->voltage_get = nouveau_voltage_gpio_get; 892 pm->voltage_get = nouveau_voltage_gpio_get;
893 pm->voltage_set = nouveau_voltage_gpio_set; 893 pm->voltage_set = nouveau_voltage_gpio_set;
894 if (device->chipset == 0x50) 894 pm->temp_get = nv84_temp_get;
895 pm->temp_get = nv40_temp_get;
896 else
897 pm->temp_get = nv84_temp_get;
898 pm->pwm_get = nv50_pm_pwm_get; 895 pm->pwm_get = nv50_pm_pwm_get;
899 pm->pwm_set = nv50_pm_pwm_set; 896 pm->pwm_set = nv50_pm_pwm_set;
900 } else 897 } else