diff options
-rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 6 | ||||
-rw-r--r-- | include/drm/drm_crtc_helper.h | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 08b3359c655f..ae2fd5cd8dfa 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
@@ -923,8 +923,8 @@ void drm_helper_connector_dpms(struct drm_connector *connector, int mode) | |||
923 | } | 923 | } |
924 | EXPORT_SYMBOL(drm_helper_connector_dpms); | 924 | EXPORT_SYMBOL(drm_helper_connector_dpms); |
925 | 925 | ||
926 | int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, | 926 | void drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, |
927 | struct drm_mode_fb_cmd2 *mode_cmd) | 927 | struct drm_mode_fb_cmd2 *mode_cmd) |
928 | { | 928 | { |
929 | int i; | 929 | int i; |
930 | 930 | ||
@@ -937,8 +937,6 @@ int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, | |||
937 | drm_fb_get_bpp_depth(mode_cmd->pixel_format, &fb->depth, | 937 | drm_fb_get_bpp_depth(mode_cmd->pixel_format, &fb->depth, |
938 | &fb->bits_per_pixel); | 938 | &fb->bits_per_pixel); |
939 | fb->pixel_format = mode_cmd->pixel_format; | 939 | fb->pixel_format = mode_cmd->pixel_format; |
940 | |||
941 | return 0; | ||
942 | } | 940 | } |
943 | EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct); | 941 | EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct); |
944 | 942 | ||
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index b1388b5fe7ac..b6c17980cd00 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
@@ -139,8 +139,8 @@ extern void drm_helper_connector_dpms(struct drm_connector *connector, int mode) | |||
139 | 139 | ||
140 | extern void drm_helper_move_panel_connectors_to_head(struct drm_device *); | 140 | extern void drm_helper_move_panel_connectors_to_head(struct drm_device *); |
141 | 141 | ||
142 | extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, | 142 | extern void drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, |
143 | struct drm_mode_fb_cmd2 *mode_cmd); | 143 | struct drm_mode_fb_cmd2 *mode_cmd); |
144 | 144 | ||
145 | static inline void drm_crtc_helper_add(struct drm_crtc *crtc, | 145 | static inline void drm_crtc_helper_add(struct drm_crtc *crtc, |
146 | const struct drm_crtc_helper_funcs *funcs) | 146 | const struct drm_crtc_helper_funcs *funcs) |