diff options
author | Dave Airlie <airlied@redhat.com> | 2011-11-29 15:02:54 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-11-29 15:02:54 -0500 |
commit | 248dbc2350501e2c7b9f5ceb60c75515d82f4134 (patch) | |
tree | fb12f25d61f71eeba77931b96e58950fc9afd46f /include/drm | |
parent | 435ddd926e880f14ea2ae37062b9b45231d7fdf9 (diff) |
drm: move the fb bpp/depth helper into the core.
This is used by nearly everyone including vmwgfx which doesn't generally
use the fb helper.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_crtc.h | 3 | ||||
-rw-r--r-- | include/drm/drm_crtc_helper.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index a2fbf3399682..6718b1873dfc 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -902,4 +902,7 @@ extern int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, | |||
902 | void *data, struct drm_file *file_priv); | 902 | void *data, struct drm_file *file_priv); |
903 | extern int drm_mode_destroy_dumb_ioctl(struct drm_device *dev, | 903 | extern int drm_mode_destroy_dumb_ioctl(struct drm_device *dev, |
904 | void *data, struct drm_file *file_priv); | 904 | void *data, struct drm_file *file_priv); |
905 | |||
906 | extern void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth, | ||
907 | int *bpp); | ||
905 | #endif /* __DRM_CRTC_H__ */ | 908 | #endif /* __DRM_CRTC_H__ */ |
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index b4abb33dbcd8..e88b7d70594e 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
@@ -116,8 +116,6 @@ extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder); | |||
116 | 116 | ||
117 | extern void drm_helper_connector_dpms(struct drm_connector *connector, int mode); | 117 | extern void drm_helper_connector_dpms(struct drm_connector *connector, int mode); |
118 | 118 | ||
119 | extern void drm_helper_get_fb_bpp_depth(uint32_t format, unsigned int *depth, | ||
120 | int *bpp); | ||
121 | extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, | 119 | extern int drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb, |
122 | struct drm_mode_fb_cmd2 *mode_cmd); | 120 | struct drm_mode_fb_cmd2 *mode_cmd); |
123 | 121 | ||