diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-10-07 19:01:13 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-08 05:27:43 -0400 |
commit | 723bfd707a97fee06eb3ba4d3e8b4714c29a1064 (patch) | |
tree | c18c26590cfbb50e5b1295e5819f6bebd49e82c1 /drivers/gpu/drm/i915/i915_drv.h | |
parent | 01cb9ea633ddf3e8770dfe7851e88610087098bc (diff) |
drm/i915: add _DSM support
The _DSM method on the integrated graphics device can tell us which
connectors are muxable, so add support for making the call and parsing
out the connector info.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[ickle: fix compiler warnings for using uninitialized 'result' and
downgrade error message for non-switchable devices]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 73ad8bff2c2a..e4ffcd3a7aef 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -1136,6 +1136,15 @@ static inline void intel_opregion_gse_intr(struct drm_device *dev) { return; } | |||
1136 | static inline void intel_opregion_enable_asle(struct drm_device *dev) { return; } | 1136 | static inline void intel_opregion_enable_asle(struct drm_device *dev) { return; } |
1137 | #endif | 1137 | #endif |
1138 | 1138 | ||
1139 | /* intel_acpi.c */ | ||
1140 | #ifdef CONFIG_ACPI | ||
1141 | extern void intel_register_dsm_handler(void); | ||
1142 | extern void intel_unregister_dsm_handler(void); | ||
1143 | #else | ||
1144 | static inline void intel_register_dsm_handler(void) { return; } | ||
1145 | static inline void intel_unregister_dsm_handler(void) { return; } | ||
1146 | #endif /* CONFIG_ACPI */ | ||
1147 | |||
1139 | /* modesetting */ | 1148 | /* modesetting */ |
1140 | extern void intel_modeset_init(struct drm_device *dev); | 1149 | extern void intel_modeset_init(struct drm_device *dev); |
1141 | extern void intel_modeset_cleanup(struct drm_device *dev); | 1150 | extern void intel_modeset_cleanup(struct drm_device *dev); |