drm: Don't export the drm_fb_get_bpp_depth() function

The function is only used by the drm_helper_mode_fill_fb_struct() core
function to fill the drm_framebuffer bpp and depth fields, used by
drivers that haven't been converted to use pixel formats directly yet.
It should not be used by new drivers, so inline it in its only caller.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1476744081-24485-14-git-send-email-laurent.pinchart@ideasonboard.com

diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
index 523ed916a1c05a643b16bf64570c39e5d8a08ef0..cbb8b77c363cafaddc2148e1faab8e42bb5c56ac 100644 (file)
--- a/drivers/gpu/drm/drm_fourcc.c
+++ b/drivers/gpu/drm/drm_fourcc.c
@@ -202,37 +202,6 @@ const struct drm_format_info *drm_format_info(u32 format)
 }
 EXPORT_SYMBOL(drm_format_info);
 
-/**
- * drm_fb_get_bpp_depth - get the bpp/depth values for format
- * @format: pixel format (DRM_FORMAT_*)
- * @depth: storage for the depth value
- * @bpp: storage for the bpp value
- *
- * This only supports RGB formats here for compat with code that doesn't use
- * pixel formats directly yet.
- */
-void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
-                         int *bpp)
-{
-       const struct drm_format_info *info;
-
-       info = drm_format_info(format);
-       if (!info || !info->depth) {
-               char *format_name = drm_get_format_name(format);
-
-               DRM_DEBUG_KMS("unsupported pixel format %s\n", format_name);
-               kfree(format_name);
-
-               *depth = 0;
-               *bpp = 0;
-               return;
-       }
-
-       *depth = info->depth;
-       *bpp = info->cpp[0] * 8;
-}
-EXPORT_SYMBOL(drm_fb_get_bpp_depth);
-
 /**
  * drm_format_num_planes - get the number of planes for format
  * @format: pixel format (DRM_FORMAT_*)

diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c
index 1d45738f8f980ba1767a5696a6ae8bf879ef0d09..2544dfe7354ca7da0d2f6765b6d25d23080e38e5 100644 (file)
--- a/drivers/gpu/drm/drm_modeset_helper.c
+++ b/drivers/gpu/drm/drm_modeset_helper.c
@@ -70,8 +70,23 @@ EXPORT_SYMBOL(drm_helper_move_panel_connectors_to_head);
 void drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
                                    const struct drm_mode_fb_cmd2 *mode_cmd)
 {
+       const struct drm_format_info *info;
        int i;
 
+       info = drm_format_info(mode_cmd->pixel_format);
+       if (!info || !info->depth) {
+               char *format_name = drm_get_format_name(mode_cmd->pixel_format);
+
+               DRM_DEBUG_KMS("non-RGB pixel format %s\n", format_name);
+               kfree(format_name);
+
+               fb->depth = 0;
+               fb->bits_per_pixel = 0;
+       } else {
+               fb->depth = info->depth;
+               fb->bits_per_pixel = info->cpp[0] * 8;
+       }
+
        fb->width = mode_cmd->width;
        fb->height = mode_cmd->height;
        for (i = 0; i < 4; i++) {
@@ -79,8 +94,6 @@ void drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
                fb->offsets[i] = mode_cmd->offsets[i];
                fb->modifier[i] = mode_cmd->modifier[i];
        }
-       drm_fb_get_bpp_depth(mode_cmd->pixel_format, &fb->depth,
-                                   &fb->bits_per_pixel);
        fb->pixel_format = mode_cmd->pixel_format;
        fb->flags = mode_cmd->flags;
 }

diff --git a/include/drm/drm_fourcc.h b/include/drm/drm_fourcc.h
index f73f97afd1e21d15770709e91ea91f0bfaa80095..dc0aafab9ffd21fb2431cba061225a2e182f8163 100644 (file)
--- a/include/drm/drm_fourcc.h
+++ b/include/drm/drm_fourcc.h
@@ -48,7 +48,6 @@ struct drm_format_info {
 const struct drm_format_info *__drm_format_info(u32 format);
 const struct drm_format_info *drm_format_info(u32 format);
 uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth);
-void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth, int *bpp);
 int drm_format_num_planes(uint32_t format);
 int drm_format_plane_cpp(uint32_t format, int plane);
 int drm_format_horz_chroma_subsampling(uint32_t format);