[21/21] drm/fb-helper: Unexport fill_{var,info}
diff mbox series

Message ID 20190326132008.11781-21-daniel.vetter@ffwll.ch
State New
Headers show
Series
  • [01/21] drm/fb-helper: Add fill_info() functions
Related show

Commit Message

Daniel Vetter March 26, 2019, 1:20 p.m. UTC
Not used by drivers anymore.

v2: Rebase

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/drm_fb_helper.c | 38 +++++----------------------------
 include/drm/drm_fb_helper.h     |  4 ----
 2 files changed, 5 insertions(+), 37 deletions(-)

Comments

Alex Deucher March 26, 2019, 2:34 p.m. UTC | #1
On Tue, Mar 26, 2019 at 9:21 AM Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> Not used by drivers anymore.
>
> v2: Rebase
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Other than the spelling typos noted by Noralf, the series is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>


> ---
>  drivers/gpu/drm/drm_fb_helper.c | 38 +++++----------------------------
>  include/drm/drm_fb_helper.h     |  4 ----
>  2 files changed, 5 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 42423ca28991..6ae8d5fa142c 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -2037,21 +2037,8 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
>         return 0;
>  }
>
> -/**
> - * drm_fb_helper_fill_fix - initializes fixed fbdev information
> - * @info: fbdev registered by the helper
> - * @pitch: desired pitch
> - * @depth: desired depth
> - *
> - * Helper to fill in the fixed fbdev information useful for a non-accelerated
> - * fbdev emulations. Drivers which support acceleration methods which impose
> - * additional constraints need to set up their own limits.
> - *
> - * Drivers should call this (or their equivalent setup code) from their
> - * &drm_fb_helper_funcs.fb_probe callback.
> - */
> -void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
> -                           uint32_t depth)
> +static void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
> +                                  uint32_t depth)
>  {
>         info->fix.type = FB_TYPE_PACKED_PIXELS;
>         info->fix.visual = depth == 8 ? FB_VISUAL_PSEUDOCOLOR :
> @@ -2066,24 +2053,10 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
>
>         info->fix.line_length = pitch;
>  }
> -EXPORT_SYMBOL(drm_fb_helper_fill_fix);
>
> -/**
> - * drm_fb_helper_fill_var - initalizes variable fbdev information
> - * @info: fbdev instance to set up
> - * @fb_helper: fb helper instance to use as template
> - * @fb_width: desired fb width
> - * @fb_height: desired fb height
> - *
> - * Sets up the variable fbdev metainformation from the given fb helper instance
> - * and the drm framebuffer allocated in &drm_fb_helper.fb.
> - *
> - * Drivers should call this (or their equivalent setup code) from their
> - * &drm_fb_helper_funcs.fb_probe callback after having allocated the fbdev
> - * backing storage framebuffer.
> - */
> -void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
> -                           uint32_t fb_width, uint32_t fb_height)
> +static void drm_fb_helper_fill_var(struct fb_info *info,
> +                                  struct drm_fb_helper *fb_helper,
> +                                  uint32_t fb_width, uint32_t fb_height)
>  {
>         struct drm_framebuffer *fb = fb_helper->fb;
>
> @@ -2103,7 +2076,6 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe
>         info->var.xres = fb_width;
>         info->var.yres = fb_height;
>  }
> -EXPORT_SYMBOL(drm_fb_helper_fill_var);
>
>  /**
>   * drm_fb_helper_fill_info - initializes fbdev information
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index 9ef72f20662d..9ba9db5dc34d 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -289,10 +289,6 @@ int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper);
>
>  struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper);
>  void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper);
> -void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
> -                           uint32_t fb_width, uint32_t fb_height);
> -void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
> -                           uint32_t depth);
>  void drm_fb_helper_fill_info(struct fb_info *info,
>                              struct drm_fb_helper *fb_helper,
>                              struct drm_fb_helper_surface_size *sizes);
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Noralf Trønnes March 26, 2019, 3:01 p.m. UTC | #2
Den 26.03.2019 14.20, skrev Daniel Vetter:
> Not used by drivers anymore.
> 
> v2: Rebase
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---

Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Daniel Vetter March 27, 2019, 9:13 a.m. UTC | #3
On Tue, Mar 26, 2019 at 04:01:29PM +0100, Noralf Trønnes wrote:
> 
> 
> Den 26.03.2019 14.20, skrev Daniel Vetter:
> > Not used by drivers anymore.
> > 
> > v2: Rebase
> > 
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> 
> Reviewed-by: Noralf Trønnes <noralf@tronnes.org>

Thanks for your review, I pulled in all your suggestions and applied the
entire series.
-Daniel

Patch
diff mbox series

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 42423ca28991..6ae8d5fa142c 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -2037,21 +2037,8 @@  static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 	return 0;
 }
 
-/**
- * drm_fb_helper_fill_fix - initializes fixed fbdev information
- * @info: fbdev registered by the helper
- * @pitch: desired pitch
- * @depth: desired depth
- *
- * Helper to fill in the fixed fbdev information useful for a non-accelerated
- * fbdev emulations. Drivers which support acceleration methods which impose
- * additional constraints need to set up their own limits.
- *
- * Drivers should call this (or their equivalent setup code) from their
- * &drm_fb_helper_funcs.fb_probe callback.
- */
-void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
-			    uint32_t depth)
+static void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
+				   uint32_t depth)
 {
 	info->fix.type = FB_TYPE_PACKED_PIXELS;
 	info->fix.visual = depth == 8 ? FB_VISUAL_PSEUDOCOLOR :
@@ -2066,24 +2053,10 @@  void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
 
 	info->fix.line_length = pitch;
 }
-EXPORT_SYMBOL(drm_fb_helper_fill_fix);
 
-/**
- * drm_fb_helper_fill_var - initalizes variable fbdev information
- * @info: fbdev instance to set up
- * @fb_helper: fb helper instance to use as template
- * @fb_width: desired fb width
- * @fb_height: desired fb height
- *
- * Sets up the variable fbdev metainformation from the given fb helper instance
- * and the drm framebuffer allocated in &drm_fb_helper.fb.
- *
- * Drivers should call this (or their equivalent setup code) from their
- * &drm_fb_helper_funcs.fb_probe callback after having allocated the fbdev
- * backing storage framebuffer.
- */
-void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
-			    uint32_t fb_width, uint32_t fb_height)
+static void drm_fb_helper_fill_var(struct fb_info *info,
+				   struct drm_fb_helper *fb_helper,
+				   uint32_t fb_width, uint32_t fb_height)
 {
 	struct drm_framebuffer *fb = fb_helper->fb;
 
@@ -2103,7 +2076,6 @@  void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe
 	info->var.xres = fb_width;
 	info->var.yres = fb_height;
 }
-EXPORT_SYMBOL(drm_fb_helper_fill_var);
 
 /**
  * drm_fb_helper_fill_info - initializes fbdev information
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 9ef72f20662d..9ba9db5dc34d 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -289,10 +289,6 @@  int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper);
 
 struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper);
 void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper);
-void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helper,
-			    uint32_t fb_width, uint32_t fb_height);
-void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
-			    uint32_t depth);
 void drm_fb_helper_fill_info(struct fb_info *info,
 			     struct drm_fb_helper *fb_helper,
 			     struct drm_fb_helper_surface_size *sizes);