[PATCH] drm/fb-helper: Fixup fill_info cleanup

[PATCH] drm/fb-helper: Fixup fill_info cleanup

[Daniel Vetter]

I forgot the !CONFIG_FBDEV case. Also some kerneldoc needed more
adjusting.

Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/drm_fb_helper.c |  5 ++---
 include/drm/drm_fb_helper.h     | 18 ++++++------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 5c5ab6a2aa1f..c2e8dae6d828 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -2783,9 +2783,8 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper,
  *
  * This function will call down into the &drm_fb_helper_funcs.fb_probe callback
  * to let the driver allocate and initialize the fbdev info structure and the
- * drm framebuffer used to back the fbdev. drm_fb_helper_fill_var() and
- * drm_fb_helper_fill_fix() are provided as helpers to setup simple default
- * values for the fbdev info structure.
+ * drm framebuffer used to back the fbdev. drm_fb_helper_fill_info() is provided
+ * as a helper to setup simple default values for the fbdev info structure.
  *
  * HANG DEBUGGING:
  *
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 9ba9db5dc34d..17857e458ac3 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -68,10 +68,8 @@ struct drm_fb_helper_crtc {
  * according to the largest width/height (so it is large enough for all CRTCs
  * to scanout).  But the fbdev width/height is sized to the minimum width/
  * height of all the displays.  This ensures that fbcon fits on the smallest
- * of the attached displays.
- *
- * So what is passed to drm_fb_helper_fill_var() should be fb_width/fb_height,
- * rather than the surface size.
+ * of the attached displays. fb_width/fb_height is used by
+ * drm_fb_helper_fill_info() to fill out the &fb_info.var structure.
  */
 struct drm_fb_helper_surface_size {
 	u32 fb_width;
@@ -417,14 +415,10 @@ static inline void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)
 {
 }
 
-static inline 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 inline void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
-					  uint32_t depth)
+static inline 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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/fb-helper: Fixup fill_info cleanup

[Noralf Trønnes]

Den 27.03.2019 13.58, skrev Daniel Vetter:
> I forgot the !CONFIG_FBDEV case. Also some kerneldoc needed more
> adjusting.
> 
> Cc: Noralf Trønnes <noralf@tronnes.org>
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---

Really nice that we have all these bots helping us out.

Reviewed-by: Noralf Trønnes <noralf@tronnes.org>

>  drivers/gpu/drm/drm_fb_helper.c |  5 ++---
>  include/drm/drm_fb_helper.h     | 18 ++++++------------
>  2 files changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 5c5ab6a2aa1f..c2e8dae6d828 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -2783,9 +2783,8 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper,
>   *
>   * This function will call down into the &drm_fb_helper_funcs.fb_probe callback
>   * to let the driver allocate and initialize the fbdev info structure and the
> - * drm framebuffer used to back the fbdev. drm_fb_helper_fill_var() and
> - * drm_fb_helper_fill_fix() are provided as helpers to setup simple default
> - * values for the fbdev info structure.
> + * drm framebuffer used to back the fbdev. drm_fb_helper_fill_info() is provided
> + * as a helper to setup simple default values for the fbdev info structure.
>   *
>   * HANG DEBUGGING:
>   *
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index 9ba9db5dc34d..17857e458ac3 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -68,10 +68,8 @@ struct drm_fb_helper_crtc {
>   * according to the largest width/height (so it is large enough for all CRTCs
>   * to scanout).  But the fbdev width/height is sized to the minimum width/
>   * height of all the displays.  This ensures that fbcon fits on the smallest
> - * of the attached displays.
> - *
> - * So what is passed to drm_fb_helper_fill_var() should be fb_width/fb_height,
> - * rather than the surface size.
> + * of the attached displays. fb_width/fb_height is used by
> + * drm_fb_helper_fill_info() to fill out the &fb_info.var structure.
>   */
>  struct drm_fb_helper_surface_size {
>  	u32 fb_width;
> @@ -417,14 +415,10 @@ static inline void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)
>  {
>  }
>  
> -static inline 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 inline void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
> -					  uint32_t depth)
> +static inline void
> +drm_fb_helper_fill_info(struct fb_info *info,
> +			struct drm_fb_helper *fb_helper,
> +			struct drm_fb_helper_surface_size *sizes)
>  {
>  }
>  
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/fb-helper: Fixup fill_info cleanup

[Daniel Vetter]

On Wed, Mar 27, 2019 at 02:29:01PM +0100, Noralf Trønnes wrote:
> 
> 
> Den 27.03.2019 13.58, skrev Daniel Vetter:
> > I forgot the !CONFIG_FBDEV case. Also some kerneldoc needed more
> > adjusting.
> > 
> > Cc: Noralf Trønnes <noralf@tronnes.org>
> > Cc: Alex Deucher <alexander.deucher@amd.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> 
> Really nice that we have all these bots helping us out.

Yeah, which reminds me, I need to add:

Reported-by: 	kbuild test robot <lkp@intel.com> 

> Reviewed-by: Noralf Trønnes <noralf@tronnes.org>

Thanks, will pull in as soon as intel CI approves.
-Daniel

> 
> >  drivers/gpu/drm/drm_fb_helper.c |  5 ++---
> >  include/drm/drm_fb_helper.h     | 18 ++++++------------
> >  2 files changed, 8 insertions(+), 15 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> > index 5c5ab6a2aa1f..c2e8dae6d828 100644
> > --- a/drivers/gpu/drm/drm_fb_helper.c
> > +++ b/drivers/gpu/drm/drm_fb_helper.c
> > @@ -2783,9 +2783,8 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper,
> >   *
> >   * This function will call down into the &drm_fb_helper_funcs.fb_probe callback
> >   * to let the driver allocate and initialize the fbdev info structure and the
> > - * drm framebuffer used to back the fbdev. drm_fb_helper_fill_var() and
> > - * drm_fb_helper_fill_fix() are provided as helpers to setup simple default
> > - * values for the fbdev info structure.
> > + * drm framebuffer used to back the fbdev. drm_fb_helper_fill_info() is provided
> > + * as a helper to setup simple default values for the fbdev info structure.
> >   *
> >   * HANG DEBUGGING:
> >   *
> > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> > index 9ba9db5dc34d..17857e458ac3 100644
> > --- a/include/drm/drm_fb_helper.h
> > +++ b/include/drm/drm_fb_helper.h
> > @@ -68,10 +68,8 @@ struct drm_fb_helper_crtc {
> >   * according to the largest width/height (so it is large enough for all CRTCs
> >   * to scanout).  But the fbdev width/height is sized to the minimum width/
> >   * height of all the displays.  This ensures that fbcon fits on the smallest
> > - * of the attached displays.
> > - *
> > - * So what is passed to drm_fb_helper_fill_var() should be fb_width/fb_height,
> > - * rather than the surface size.
> > + * of the attached displays. fb_width/fb_height is used by
> > + * drm_fb_helper_fill_info() to fill out the &fb_info.var structure.
> >   */
> >  struct drm_fb_helper_surface_size {
> >  	u32 fb_width;
> > @@ -417,14 +415,10 @@ static inline void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)
> >  {
> >  }
> >  
> > -static inline 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 inline void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch,
> > -					  uint32_t depth)
> > +static inline void
> > +drm_fb_helper_fill_info(struct fb_info *info,
> > +			struct drm_fb_helper *fb_helper,
> > +			struct drm_fb_helper_surface_size *sizes)
> >  {
> >  }
> >  
> > 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx