| Message ID | 20190326132008.11781-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/21] drm/fb-helper: Add fill_info() functions | expand |
Den 26.03.2019 14.19, skrev Daniel Vetter: > The fbdev split between fix and var information is kinda > pointless for drm drivers since everything is fixed: The fbdev > emulation doesn't support changing modes at all. > > Create a new simplified helper and use it in the generic fbdev > helper code. Follow-up patches will beef it up more and roll > it out to all drivers. > > v2: We need to keep sizes, since they might not match the fb dimesions dimesions -> dimensions > (Noralf) > > Cc: Noralf Trønnes <noralf@tronnes.org> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/drm_fb_helper.c | 30 ++++++++++++++++++++++++++++-- > include/drm/drm_fb_helper.h | 3 +++ > 2 files changed, 31 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index c3d6a8c78a51..b89d177228e2 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -2105,6 +2105,33 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe > } > EXPORT_SYMBOL(drm_fb_helper_fill_var); > > +/** > + * drm_fb_helper_fill_info - initializes fbdev information > + * @info: fbdev instance to set up > + * @fb_helper: fb helper instance to use as template > + * @sizes: describes fbdev size and scanout surface size > + * > + * You might want to remove the extra newline here. Reviewed-by: Noralf Trønnes <noralf@tronnes.org> > + * Sets up the variable and fixed 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_info(struct fb_info *info, > + struct drm_fb_helper *fb_helper, > + struct drm_fb_helper_surface_size *sizes) > +{ > + struct drm_framebuffer *fb = fb_helper->fb; > + > + drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); > + drm_fb_helper_fill_var(info, fb_helper, > + sizes->fb_width, sizes->fb_height); > + > +} > +EXPORT_SYMBOL(drm_fb_helper_fill_info); > + > static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper, > uint32_t maxX, > uint32_t maxY) > @@ -3165,8 +3192,7 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, > #endif > strcpy(fbi->fix.id, "DRM emulated"); > > - drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); > - drm_fb_helper_fill_var(fbi, fb_helper, sizes->fb_width, sizes->fb_height); > + drm_fb_helper_fill_info(fbi, fb_helper, sizes); > > if (fb->funcs->dirty) { > struct fb_ops *fbops; > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h > index 286d58efed5d..9ef72f20662d 100644 > --- a/include/drm/drm_fb_helper.h > +++ b/include/drm/drm_fb_helper.h > @@ -293,6 +293,9 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe > 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); > > void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper); > >
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index c3d6a8c78a51..b89d177228e2 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2105,6 +2105,33 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe } EXPORT_SYMBOL(drm_fb_helper_fill_var); +/** + * drm_fb_helper_fill_info - initializes fbdev information + * @info: fbdev instance to set up + * @fb_helper: fb helper instance to use as template + * @sizes: describes fbdev size and scanout surface size + * + * + * Sets up the variable and fixed 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_info(struct fb_info *info, + struct drm_fb_helper *fb_helper, + struct drm_fb_helper_surface_size *sizes) +{ + struct drm_framebuffer *fb = fb_helper->fb; + + drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); + drm_fb_helper_fill_var(info, fb_helper, + sizes->fb_width, sizes->fb_height); + +} +EXPORT_SYMBOL(drm_fb_helper_fill_info); + static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper, uint32_t maxX, uint32_t maxY) @@ -3165,8 +3192,7 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, #endif strcpy(fbi->fix.id, "DRM emulated"); - drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(fbi, fb_helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(fbi, fb_helper, sizes); if (fb->funcs->dirty) { struct fb_ops *fbops; diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 286d58efed5d..9ef72f20662d 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -293,6 +293,9 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe 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); void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper);
The fbdev split between fix and var information is kinda pointless for drm drivers since everything is fixed: The fbdev emulation doesn't support changing modes at all. Create a new simplified helper and use it in the generic fbdev helper code. Follow-up patches will beef it up more and roll it out to all drivers. v2: We need to keep sizes, since they might not match the fb dimesions (Noralf) Cc: Noralf Trønnes <noralf@tronnes.org> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/drm_fb_helper.c | 30 ++++++++++++++++++++++++++++-- include/drm/drm_fb_helper.h | 3 +++ 2 files changed, 31 insertions(+), 2 deletions(-)