Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0f095f7 authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/fb-cma-helper: Remove unused functions 



The cma drivers use the drm_gem_framebuffer_helper functions now,
so remove drm_fb_cma_destroy, drm_fb_cma_create_handle,
drm_fb_cma_create_with_funcs, drm_fb_cma_create and
drm_fb_cma_prepare_fb.

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1506255985-61113-11-git-send-email-noralf@tronnes.org
parent 57b8a4bf

drivers/gpu/drm/drm_fb_cma_helper.c

+3 −74
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct drm_fbdev_cma { 
 * Provides helper functions for creating a cma (contiguous memory allocator)

 * backed framebuffer.

 *

 * drm_fb_cma_create() is used in the &drm_mode_config_funcs.fb_create

 * drm_gem_fb_create() is used in the &drm_mode_config_funcs.fb_create

 * callback function to create a cma backed framebuffer.

 *

 * An fbdev framebuffer backed by cma is also available by calling
@@ -61,8 +61,8 @@ struct drm_fbdev_cma { 
 *     }

 *

 *     static struct drm_framebuffer_funcs driver_fb_funcs = {

 *         .destroy       = drm_fb_cma_destroy,

 *         .create_handle = drm_fb_cma_create_handle,

 *         .destroy       = drm_gem_fb_destroy,

 *         .create_handle = drm_gem_fb_create_handle,

 *         .dirty         = driver_fb_dirty,

 *     };

 *
@@ -80,57 +80,6 @@ static inline struct drm_fbdev_cma *to_fbdev_cma(struct drm_fb_helper *helper) 
	return container_of(helper, struct drm_fbdev_cma, fb_helper);

}



void drm_fb_cma_destroy(struct drm_framebuffer *fb)

{

	drm_gem_fb_destroy(fb);

}

EXPORT_SYMBOL(drm_fb_cma_destroy);



int drm_fb_cma_create_handle(struct drm_framebuffer *fb,

	struct drm_file *file_priv, unsigned int *handle)

{

	return drm_gem_fb_create_handle(fb, file_priv, handle);

}

EXPORT_SYMBOL(drm_fb_cma_create_handle);



/**

 * drm_fb_cma_create_with_funcs() - helper function for the

 *                                  &drm_mode_config_funcs.fb_create

 *                                  callback

 * @dev: DRM device

 * @file_priv: drm file for the ioctl call

 * @mode_cmd: metadata from the userspace fb creation request

 * @funcs: vtable to be used for the new framebuffer object

 *

 * This can be used to set &drm_framebuffer_funcs for drivers that need the

 * &drm_framebuffer_funcs.dirty callback. Use drm_fb_cma_create() if you don't

 * need to change &drm_framebuffer_funcs.

 */

struct drm_framebuffer *drm_fb_cma_create_with_funcs(struct drm_device *dev,

	struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd,

	const struct drm_framebuffer_funcs *funcs)

{

	return drm_gem_fb_create_with_funcs(dev, file_priv, mode_cmd, funcs);

}

EXPORT_SYMBOL_GPL(drm_fb_cma_create_with_funcs);



/**

 * drm_fb_cma_create() - &drm_mode_config_funcs.fb_create callback function

 * @dev: DRM device

 * @file_priv: drm file for the ioctl call

 * @mode_cmd: metadata from the userspace fb creation request

 *

 * If your hardware has special alignment or pitch requirements these should be

 * checked before calling this function. Use drm_fb_cma_create_with_funcs() if

 * you need to set &drm_framebuffer_funcs.dirty.

 */

struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev,

	struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd)

{

	return drm_gem_fb_create(dev, file_priv, mode_cmd);

}

EXPORT_SYMBOL_GPL(drm_fb_cma_create);



/**

 * drm_fb_cma_get_gem_obj() - Get CMA GEM object for framebuffer

 * @fb: The framebuffer
@@ -181,26 +130,6 @@ dma_addr_t drm_fb_cma_get_gem_addr(struct drm_framebuffer *fb, 
}

EXPORT_SYMBOL_GPL(drm_fb_cma_get_gem_addr);



/**

 * drm_fb_cma_prepare_fb() - Prepare CMA framebuffer

 * @plane: Which plane

 * @state: Plane state attach fence to

 *

 * This should be set as the &struct drm_plane_helper_funcs.prepare_fb hook.

 *

 * This function checks if the plane FB has an dma-buf attached, extracts

 * the exclusive fence and attaches it to plane state for the atomic helper

 * to wait on.

 *

 * There is no need for cleanup_fb for CMA based framebuffer drivers.

 */

int drm_fb_cma_prepare_fb(struct drm_plane *plane,

			  struct drm_plane_state *state)

{

	return drm_gem_fb_prepare_fb(plane, state);

}

EXPORT_SYMBOL_GPL(drm_fb_cma_prepare_fb);



#ifdef CONFIG_DEBUG_FS

static void drm_fb_cma_describe(struct drm_framebuffer *fb, struct seq_file *m)

{

include/drm/drm_fb_cma_helper.h

+0 −13
Original line number Diff line number Diff line
@@ -28,16 +28,6 @@ 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);



void drm_fb_cma_destroy(struct drm_framebuffer *fb);

int drm_fb_cma_create_handle(struct drm_framebuffer *fb,

	struct drm_file *file_priv, unsigned int *handle);



struct drm_framebuffer *drm_fb_cma_create_with_funcs(struct drm_device *dev,

	struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd,

	const struct drm_framebuffer_funcs *funcs);

struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev,

	struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd);



struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer *fb,

	unsigned int plane);
@@ -45,9 +35,6 @@ dma_addr_t drm_fb_cma_get_gem_addr(struct drm_framebuffer *fb, 
				   struct drm_plane_state *state,

				   unsigned int plane);



int drm_fb_cma_prepare_fb(struct drm_plane *plane,

			  struct drm_plane_state *state);



#ifdef CONFIG_DEBUG_FS

struct seq_file;