diff options
author | Dave Airlie <airlied@linux.ie> | 2009-09-28 01:31:10 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2009-09-28 01:31:10 -0400 |
commit | 74bf2ad508efa93db4254c9da9c7238da44e2c58 (patch) | |
tree | f912544f1f916d0cadc5a832030164b9062d020a /include/drm | |
parent | 210bed8f827471e271f894fb99ee879a5d27cf30 (diff) |
drm/kms: make fb helper work for all drivers.
This initialises the fb helper with the connector helper,
so that the fb cmdline code works for intel as well.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_crtc_helper.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 4c8dacaf4f58..ef47dfd8e5e9 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
@@ -39,6 +39,7 @@ | |||
39 | 39 | ||
40 | #include <linux/fb.h> | 40 | #include <linux/fb.h> |
41 | 41 | ||
42 | #include "drm_fb_helper.h" | ||
42 | struct drm_crtc_helper_funcs { | 43 | struct drm_crtc_helper_funcs { |
43 | /* | 44 | /* |
44 | * Control power levels on the CRTC. If the mode passed in is | 45 | * Control power levels on the CRTC. If the mode passed in is |
@@ -119,10 +120,11 @@ static inline void drm_encoder_helper_add(struct drm_encoder *encoder, | |||
119 | encoder->helper_private = (void *)funcs; | 120 | encoder->helper_private = (void *)funcs; |
120 | } | 121 | } |
121 | 122 | ||
122 | static inline void drm_connector_helper_add(struct drm_connector *connector, | 123 | static inline int drm_connector_helper_add(struct drm_connector *connector, |
123 | const struct drm_connector_helper_funcs *funcs) | 124 | const struct drm_connector_helper_funcs *funcs) |
124 | { | 125 | { |
125 | connector->helper_private = (void *)funcs; | 126 | connector->helper_private = (void *)funcs; |
127 | return drm_fb_helper_add_connector(connector); | ||
126 | } | 128 | } |
127 | 129 | ||
128 | extern int drm_helper_resume_force_mode(struct drm_device *dev); | 130 | extern int drm_helper_resume_force_mode(struct drm_device *dev); |