Commit 26eb603b authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/cma-helper: Rename symbols from drm_cma_gem_ to drm_gem_cma_ 



This fixes the naming of several symbols within CMA helpers. No functional
changes are made.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200605073247.4057-2-tzimmermann@suse.de
parent 7d2cd72a

drivers/gpu/drm/aspeed/aspeed_gfx_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops); 


static struct drm_driver aspeed_gfx_driver = {

	.driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,

	.gem_create_object	= drm_cma_gem_create_object_default_funcs,

	.gem_create_object	= drm_gem_cma_create_object_default_funcs,

	.dumb_create		= drm_gem_cma_dumb_create,

	.prime_handle_to_fd	= drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle	= drm_gem_prime_fd_to_handle,

drivers/gpu/drm/drm_gem_cma_helper.c

+5 −5
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr) 
}

EXPORT_SYMBOL_GPL(drm_gem_cma_prime_vunmap);



static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = {

static const struct drm_gem_object_funcs drm_gem_cma_default_funcs = {

	.free = drm_gem_cma_free_object,

	.print_info = drm_gem_cma_print_info,

	.get_sg_table = drm_gem_cma_prime_get_sg_table,
@@ -581,7 +581,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { 
};



/**

 * drm_cma_gem_create_object_default_funcs - Create a CMA GEM object with a

 * drm_gem_cma_create_object_default_funcs - Create a CMA GEM object with a

 *                                           default function table

 * @dev: DRM device

 * @size: Size of the object to allocate
@@ -593,7 +593,7 @@ static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { 
 * A pointer to a allocated GEM object or an error pointer on failure.

 */

struct drm_gem_object *

drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size)

drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size)

{

	struct drm_gem_cma_object *cma_obj;
@@ -601,11 +601,11 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size) 
	if (!cma_obj)

		return NULL;



	cma_obj->base.funcs = &drm_cma_gem_default_funcs;

	cma_obj->base.funcs = &drm_gem_cma_default_funcs;



	return &cma_obj->base;

}

EXPORT_SYMBOL(drm_cma_gem_create_object_default_funcs);

EXPORT_SYMBOL(drm_gem_cma_create_object_default_funcs);



/**

 * drm_gem_cma_prime_import_sg_table_vmap - PRIME import another driver's

include/drm/drm_gem_cma_helper.h

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ void *drm_gem_cma_prime_vmap(struct drm_gem_object *obj); 
void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr);



struct drm_gem_object *

drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size);

drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size);



/**

 * DRM_GEM_CMA_VMAP_DRIVER_OPS - CMA GEM driver operations ensuring a virtual
@@ -118,7 +118,7 @@ drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size); 
 * imported buffers.

 */

#define DRM_GEM_CMA_VMAP_DRIVER_OPS \

	.gem_create_object	= drm_cma_gem_create_object_default_funcs, \

	.gem_create_object	= drm_gem_cma_create_object_default_funcs, \

	.dumb_create		= drm_gem_cma_dumb_create, \

	.prime_handle_to_fd	= drm_gem_prime_handle_to_fd, \

	.prime_fd_to_handle	= drm_gem_prime_fd_to_handle, \