On Fri, Oct 20, 2017 at 01:02:00AM +0200, Noralf Trønnes wrote:
> drm_fb_helper is *the* way of doing fbdev emulation so add a pointer to
> struct drm_device. This makes it possible to add callback helpers for
> .last_close and .output_poll_changed further reducing fbdev emulation
> footprint in drivers. The pointer is set by drm_fb_helper_init() and
> cleared by drm_fb_helper_fini().
>
> Signed-off-by: Noralf Trønnes <noralf@xxxxxxxxxxx>
> ---
>
> This patch was initially part of the patchset: drm/tinydrm: Use vmalloc BO
> Changes since previous version:
> - Change member name: fbdev -> drm_fb_helper_private
> - Expand docs
> - Set and clear pointer in drm_fb_helper_init/fini()
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
>
> drivers/gpu/drm/drm_fb_helper.c | 13 +++++++++++--
> include/drm/drm_device.h | 9 +++++++++
> 2 files changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
> index 954cdd48de92..c07b7af8de4c 100644
> --- a/drivers/gpu/drm/drm_fb_helper.c
> +++ b/drivers/gpu/drm/drm_fb_helper.c
> @@ -799,8 +799,10 @@ int drm_fb_helper_init(struct drm_device *dev,
> struct drm_mode_config *config = &dev->mode_config;
> int i;
>
> - if (!drm_fbdev_emulation)
> + if (!drm_fbdev_emulation) {
> + dev->drm_fb_helper_private = fb_helper;
> return 0;
> + }
>
> if (!max_conn_count)
> return -EINVAL;
> @@ -835,6 +837,8 @@ int drm_fb_helper_init(struct drm_device *dev,
> i++;
> }
>
> + dev->drm_fb_helper_private = fb_helper;
> +
> return 0;
> out_free:
> drm_fb_helper_crtc_free(fb_helper);
> @@ -913,7 +917,12 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)
> {
> struct fb_info *info;
>
> - if (!drm_fbdev_emulation || !fb_helper)
> + if (!fb_helper)
> + return;
> +
> + fb_helper->dev->drm_fb_helper_private = NULL;
> +
> + if (!drm_fbdev_emulation)
> return;
>
> cancel_work_sync(&fb_helper->resume_work);
> diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h
> index e21af87a2f3c..6b26262658ae 100644
> --- a/include/drm/drm_device.h
> +++ b/include/drm/drm_device.h
> @@ -17,6 +17,7 @@ struct drm_vblank_crtc;
> struct drm_sg_mem;
> struct drm_local_map;
> struct drm_vma_offset_manager;
> +struct drm_fb_helper;
>
> struct inode;
>
> @@ -185,6 +186,14 @@ struct drm_device {
> struct drm_vma_offset_manager *vma_offset_manager;
> /*@} */
> int switch_power_state;
> +
> + /**
> + * @drm_fb_helper_private:
> + *
> + * Pointer to the fbdev emulation structure.
> + * Set by drm_fb_helper_init() and cleared by drm_fb_helper_fini().
> + */
> + struct drm_fb_helper *drm_fb_helper_private;
> };
>
> #endif
> --
> 2.14.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
