aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.h
diff options
context:
space:
mode:
authorMartin Peres <martin.peres@ensi-bourges.fr>2010-09-22 14:54:22 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-09-24 02:28:28 -0400
commit34e9d85a1aae28b090ec4e72a0f98a5483c198c4 (patch)
treef7960b6f016447e19cbb14bab2c137366a67763b /drivers/gpu/drm/nouveau/nouveau_drv.h
parent64d202b4d78968979c0d44306854d41f9b71626d (diff)
drm/nouveau: Add temperature support (vbios parsing, readings, hwmon)
Signed-off-by: Martin Peres <martin.peres@ensi-bourges.fr> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 8d36ed6907d1..3fc5596df360 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -387,10 +387,26 @@ struct nouveau_pm_level {
387 u8 fanspeed; 387 u8 fanspeed;
388}; 388};
389 389
390struct nouveau_pm_temp_sensor_constants {
391 u16 offset_constant;
392 s16 offset_mult;
393 u16 offset_div;
394 u16 slope_mult;
395 u16 slope_div;
396};
397
398struct nouveau_pm_threshold_temp {
399 s16 critical;
400 s16 down_clock;
401 s16 fan_boost;
402};
403
390struct nouveau_pm_engine { 404struct nouveau_pm_engine {
391 struct nouveau_pm_voltage voltage; 405 struct nouveau_pm_voltage voltage;
392 struct nouveau_pm_level perflvl[NOUVEAU_PM_MAX_LEVEL]; 406 struct nouveau_pm_level perflvl[NOUVEAU_PM_MAX_LEVEL];
393 int nr_perflvl; 407 int nr_perflvl;
408 struct nouveau_pm_temp_sensor_constants sensor_constants;
409 struct nouveau_pm_threshold_temp threshold_temp;
394 410
395 struct nouveau_pm_level boot; 411 struct nouveau_pm_level boot;
396 struct nouveau_pm_level *cur; 412 struct nouveau_pm_level *cur;
@@ -663,6 +679,8 @@ struct drm_nouveau_private {
663 679
664 struct nouveau_fbdev *nfbdev; 680 struct nouveau_fbdev *nfbdev;
665 struct apertures_struct *apertures; 681 struct apertures_struct *apertures;
682
683 struct device *int_hwmon_dev;
666}; 684};
667 685
668static inline struct drm_nouveau_private * 686static inline struct drm_nouveau_private *