diff options
Diffstat (limited to 'include/drm/drm_crtc_helper.h')
-rw-r--r-- | include/drm/drm_crtc_helper.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index b29e20168b5..dc5873c21e4 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
@@ -39,7 +39,6 @@ | |||
39 | 39 | ||
40 | #include <linux/fb.h> | 40 | #include <linux/fb.h> |
41 | 41 | ||
42 | #include "drm_fb_helper.h" | ||
43 | struct drm_crtc_helper_funcs { | 42 | struct drm_crtc_helper_funcs { |
44 | /* | 43 | /* |
45 | * Control power levels on the CRTC. If the mode passed in is | 44 | * Control power levels on the CRTC. If the mode passed in is |
@@ -96,8 +95,6 @@ struct drm_connector_helper_funcs { | |||
96 | 95 | ||
97 | extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); | 96 | extern int drm_helper_probe_single_connector_modes(struct drm_connector *connector, uint32_t maxX, uint32_t maxY); |
98 | extern void drm_helper_disable_unused_functions(struct drm_device *dev); | 97 | extern void drm_helper_disable_unused_functions(struct drm_device *dev); |
99 | extern int drm_helper_hotplug_stage_two(struct drm_device *dev); | ||
100 | extern bool drm_helper_initial_config(struct drm_device *dev); | ||
101 | extern int drm_crtc_helper_set_config(struct drm_mode_set *set); | 98 | extern int drm_crtc_helper_set_config(struct drm_mode_set *set); |
102 | extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, | 99 | extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, |
103 | struct drm_display_mode *mode, | 100 | struct drm_display_mode *mode, |
@@ -123,12 +120,14 @@ static inline void drm_encoder_helper_add(struct drm_encoder *encoder, | |||
123 | encoder->helper_private = (void *)funcs; | 120 | encoder->helper_private = (void *)funcs; |
124 | } | 121 | } |
125 | 122 | ||
126 | static inline int drm_connector_helper_add(struct drm_connector *connector, | 123 | static inline void drm_connector_helper_add(struct drm_connector *connector, |
127 | const struct drm_connector_helper_funcs *funcs) | 124 | const struct drm_connector_helper_funcs *funcs) |
128 | { | 125 | { |
129 | connector->helper_private = (void *)funcs; | 126 | connector->helper_private = (void *)funcs; |
130 | return drm_fb_helper_add_connector(connector); | ||
131 | } | 127 | } |
132 | 128 | ||
133 | extern int drm_helper_resume_force_mode(struct drm_device *dev); | 129 | extern int drm_helper_resume_force_mode(struct drm_device *dev); |
130 | extern void drm_kms_helper_poll_init(struct drm_device *dev); | ||
131 | extern void drm_kms_helper_poll_fini(struct drm_device *dev); | ||
132 | extern void drm_helper_hpd_irq_event(struct drm_device *dev); | ||
134 | #endif | 133 | #endif |