[PATCH 22/22] drm/cma-helper: Remove drm_fbdev_cma* functions
Daniel Vetter
daniel at ffwll.ch
Mon Nov 6 09:09:26 UTC 2017
On Sat, Nov 04, 2017 at 02:04:16PM +0100, Noralf Trønnes wrote:
> Remove the unused struct drm_fbdev_cma functions.
>
> Cc: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Signed-off-by: Noralf Trønnes <noralf at tronnes.org>
On patches 22&21:
Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> drivers/gpu/drm/drm_fb_cma_helper.c | 158 ------------------------------------
> include/drm/drm_fb_cma_helper.h | 28 +------
> 2 files changed, 3 insertions(+), 183 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
> index 267c04216281..0c73957d7aad 100644
> --- a/drivers/gpu/drm/drm_fb_cma_helper.c
> +++ b/drivers/gpu/drm/drm_fb_cma_helper.c
> @@ -425,161 +425,3 @@ void drm_fb_cma_fbdev_fini(struct drm_device *dev)
> kfree(to_fbdev_cma(fb_helper));
> }
> EXPORT_SYMBOL_GPL(drm_fb_cma_fbdev_fini);
> -
> -/**
> - * drm_fbdev_cma_init_with_funcs() - Allocate and initializes a drm_fbdev_cma struct
> - * @dev: DRM device
> - * @preferred_bpp: Preferred bits per pixel for the device
> - * @max_conn_count: Maximum number of connectors
> - * @funcs: fb helper functions, in particular a custom dirty() callback
> - *
> - * Returns a newly allocated drm_fbdev_cma struct or a ERR_PTR.
> - */
> -struct drm_fbdev_cma *drm_fbdev_cma_init_with_funcs(struct drm_device *dev,
> - unsigned int preferred_bpp, unsigned int max_conn_count,
> - const struct drm_framebuffer_funcs *funcs)
> -{
> - struct drm_fbdev_cma *fbdev_cma;
> - struct drm_fb_helper *helper;
> - int ret;
> -
> - fbdev_cma = kzalloc(sizeof(*fbdev_cma), GFP_KERNEL);
> - if (!fbdev_cma) {
> - dev_err(dev->dev, "Failed to allocate drm fbdev.\n");
> - return ERR_PTR(-ENOMEM);
> - }
> - fbdev_cma->fb_funcs = funcs;
> -
> - helper = &fbdev_cma->fb_helper;
> -
> - drm_fb_helper_prepare(dev, helper, &drm_fb_cma_helper_funcs);
> -
> - ret = drm_fb_helper_init(dev, helper, max_conn_count);
> - if (ret < 0) {
> - dev_err(dev->dev, "Failed to initialize drm fb helper.\n");
> - goto err_free;
> - }
> -
> - ret = drm_fb_helper_single_add_all_connectors(helper);
> - if (ret < 0) {
> - dev_err(dev->dev, "Failed to add connectors.\n");
> - goto err_drm_fb_helper_fini;
> -
> - }
> -
> - ret = drm_fb_helper_initial_config(helper, preferred_bpp);
> - if (ret < 0) {
> - dev_err(dev->dev, "Failed to set initial hw configuration.\n");
> - goto err_drm_fb_helper_fini;
> - }
> -
> - return fbdev_cma;
> -
> -err_drm_fb_helper_fini:
> - drm_fb_helper_fini(helper);
> -err_free:
> - kfree(fbdev_cma);
> -
> - return ERR_PTR(ret);
> -}
> -EXPORT_SYMBOL_GPL(drm_fbdev_cma_init_with_funcs);
> -
> -static const struct drm_framebuffer_funcs drm_fb_cma_funcs = {
> - .destroy = drm_gem_fb_destroy,
> - .create_handle = drm_gem_fb_create_handle,
> -};
> -
> -/**
> - * drm_fbdev_cma_init() - Allocate and initializes a drm_fbdev_cma struct
> - * @dev: DRM device
> - * @preferred_bpp: Preferred bits per pixel for the device
> - * @max_conn_count: Maximum number of connectors
> - *
> - * Returns a newly allocated drm_fbdev_cma struct or a ERR_PTR.
> - */
> -struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
> - unsigned int preferred_bpp, unsigned int max_conn_count)
> -{
> - return drm_fbdev_cma_init_with_funcs(dev, preferred_bpp,
> - max_conn_count,
> - &drm_fb_cma_funcs);
> -}
> -EXPORT_SYMBOL_GPL(drm_fbdev_cma_init);
> -
> -/**
> - * drm_fbdev_cma_fini() - Free drm_fbdev_cma struct
> - * @fbdev_cma: The drm_fbdev_cma struct
> - */
> -void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma)
> -{
> - drm_fb_helper_unregister_fbi(&fbdev_cma->fb_helper);
> - if (fbdev_cma->fb_helper.fbdev)
> - drm_fbdev_cma_defio_fini(fbdev_cma->fb_helper.fbdev);
> -
> - if (fbdev_cma->fb_helper.fb)
> - drm_framebuffer_remove(fbdev_cma->fb_helper.fb);
> -
> - drm_fb_helper_fini(&fbdev_cma->fb_helper);
> - kfree(fbdev_cma);
> -}
> -EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini);
> -
> -/**
> - * drm_fbdev_cma_restore_mode() - Restores initial framebuffer mode
> - * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
> - *
> - * This function is usually called from the &drm_driver.lastclose callback.
> - */
> -void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma)
> -{
> - if (fbdev_cma)
> - drm_fb_helper_restore_fbdev_mode_unlocked(&fbdev_cma->fb_helper);
> -}
> -EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode);
> -
> -/**
> - * drm_fbdev_cma_hotplug_event() - Poll for hotpulug events
> - * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
> - *
> - * This function is usually called from the &drm_mode_config.output_poll_changed
> - * callback.
> - */
> -void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma)
> -{
> - if (fbdev_cma)
> - drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper);
> -}
> -EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event);
> -
> -/**
> - * drm_fbdev_cma_set_suspend - wrapper around drm_fb_helper_set_suspend
> - * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
> - * @state: desired state, zero to resume, non-zero to suspend
> - *
> - * Calls drm_fb_helper_set_suspend, which is a wrapper around
> - * fb_set_suspend implemented by fbdev core.
> - */
> -void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state)
> -{
> - if (fbdev_cma)
> - drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state);
> -}
> -EXPORT_SYMBOL(drm_fbdev_cma_set_suspend);
> -
> -/**
> - * drm_fbdev_cma_set_suspend_unlocked - wrapper around
> - * drm_fb_helper_set_suspend_unlocked
> - * @fbdev_cma: The drm_fbdev_cma struct, may be NULL
> - * @state: desired state, zero to resume, non-zero to suspend
> - *
> - * Calls drm_fb_helper_set_suspend, which is a wrapper around
> - * fb_set_suspend implemented by fbdev core.
> - */
> -void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
> - bool state)
> -{
> - if (fbdev_cma)
> - drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper,
> - state);
> -}
> -EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked);
> diff --git a/include/drm/drm_fb_cma_helper.h b/include/drm/drm_fb_cma_helper.h
> index 22be22e641a4..e0ed0ce29c03 100644
> --- a/include/drm/drm_fb_cma_helper.h
> +++ b/include/drm/drm_fb_cma_helper.h
> @@ -1,18 +1,10 @@
> #ifndef __DRM_FB_CMA_HELPER_H__
> #define __DRM_FB_CMA_HELPER_H__
>
> -struct drm_fbdev_cma;
> -struct drm_gem_cma_object;
> -
> -struct drm_fb_helper_surface_size;
> -struct drm_framebuffer_funcs;
> -struct drm_fb_helper_funcs;
> -struct drm_framebuffer;
> -struct drm_fb_helper;
> struct drm_device;
> -struct drm_file;
> -struct drm_mode_fb_cmd2;
> -struct drm_plane;
> +struct drm_framebuffer;
> +struct drm_framebuffer_funcs;
> +struct drm_gem_cma_object;
> struct drm_plane_state;
>
> int drm_fb_cma_fbdev_init_with_funcs(struct drm_device *dev,
> @@ -22,19 +14,6 @@ int drm_fb_cma_fbdev_init(struct drm_device *dev, unsigned int preferred_bpp,
> unsigned int max_conn_count);
> void drm_fb_cma_fbdev_fini(struct drm_device *dev);
>
> -struct drm_fbdev_cma *drm_fbdev_cma_init_with_funcs(struct drm_device *dev,
> - unsigned int preferred_bpp, unsigned int max_conn_count,
> - const struct drm_framebuffer_funcs *funcs);
> -struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
> - unsigned int preferred_bpp, unsigned int max_conn_count);
> -void drm_fbdev_cma_fini(struct drm_fbdev_cma *fbdev_cma);
> -
> -void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma);
> -void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma);
> -void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool state);
> -void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cma,
> - bool state);
> -
> struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,
> unsigned int plane);
>
> @@ -49,4 +28,3 @@ int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg);
> #endif
>
> #endif
> -
> --
> 2.14.2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
More information about the dri-devel
mailing list