summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/core/include
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-12-06 10:28:34 +1000
committerBen Skeggs <bskeggs@redhat.com>2013-02-20 16:00:25 +1000
commit1a22274b28fd47514f1463051d93028ad5f54af6 (patch)
tree392dc4690c146e0fbc729c26bf10852226e7aef9 /drivers/gpu/drm/nouveau/core/include
parent041d62469f1efff280bbb9b2239e4e246da6e0d1 (diff)
downloadop-kernel-dev-1a22274b28fd47514f1463051d93028ad5f54af6.zip
op-kernel-dev-1a22274b28fd47514f1463051d93028ad5f54af6.tar.gz
drm/nouveau/therm: better transitions and debug logging
Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Signed-off-by: Martin Peres <martin.peres@labri.fr>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/include')
-rw-r--r--drivers/gpu/drm/nouveau/core/include/subdev/therm.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/therm.h b/drivers/gpu/drm/nouveau/core/include/subdev/therm.h
index 7c83ecc..6b17b61 100644
--- a/drivers/gpu/drm/nouveau/core/include/subdev/therm.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/therm.h
@@ -4,11 +4,10 @@
#include <core/device.h>
#include <core/subdev.h>
-enum nouveau_therm_fan_mode {
- FAN_CONTROL_NONE = 0,
- FAN_CONTROL_MANUAL = 1,
- FAN_CONTROL_AUTO = 2,
- FAN_CONTROL_NR,
+enum nouveau_therm_mode {
+ NOUVEAU_THERM_CTRL_NONE = 0,
+ NOUVEAU_THERM_CTRL_MANUAL = 1,
+ NOUVEAU_THERM_CTRL_AUTO = 2,
};
enum nouveau_therm_attr_type {
OpenPOWER on IntegriCloud