Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200605073247.4057-2-tzimmermann@suse.de

+8 -8
+1 -1
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c
··· 188 188 189 189 static struct drm_driver aspeed_gfx_driver = { 190 190 .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, 191 - .gem_create_object = drm_cma_gem_create_object_default_funcs, 191 + .gem_create_object = drm_gem_cma_create_object_default_funcs, 192 192 .dumb_create = drm_gem_cma_dumb_create, 193 193 .prime_handle_to_fd = drm_gem_prime_handle_to_fd, 194 194 .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+5 -5
drivers/gpu/drm/drm_gem_cma_helper.c
··· 572 572 } 573 573 EXPORT_SYMBOL_GPL(drm_gem_cma_prime_vunmap); 574 574 575 - static const struct drm_gem_object_funcs drm_cma_gem_default_funcs = { 575 + static const struct drm_gem_object_funcs drm_gem_cma_default_funcs = { 576 576 .free = drm_gem_cma_free_object, 577 577 .print_info = drm_gem_cma_print_info, 578 578 .get_sg_table = drm_gem_cma_prime_get_sg_table, ··· 581 581 }; 582 582 583 583 /** 584 - * drm_cma_gem_create_object_default_funcs - Create a CMA GEM object with a 584 + * drm_gem_cma_create_object_default_funcs - Create a CMA GEM object with a 585 585 * default function table 586 586 * @dev: DRM device 587 587 * @size: Size of the object to allocate ··· 593 593 * A pointer to a allocated GEM object or an error pointer on failure. 594 594 */ 595 595 struct drm_gem_object * 596 - drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size) 596 + drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size) 597 597 { 598 598 struct drm_gem_cma_object *cma_obj; 599 599 ··· 601 601 if (!cma_obj) 602 602 return NULL; 603 603 604 - cma_obj->base.funcs = &drm_cma_gem_default_funcs; 604 + cma_obj->base.funcs = &drm_gem_cma_default_funcs; 605 605 606 606 return &cma_obj->base; 607 607 } 608 - EXPORT_SYMBOL(drm_cma_gem_create_object_default_funcs); 608 + EXPORT_SYMBOL(drm_gem_cma_create_object_default_funcs); 609 609 610 610 /** 611 611 * drm_gem_cma_prime_import_sg_table_vmap - PRIME import another driver's
+2 -2
include/drm/drm_gem_cma_helper.h
··· 107 107 void drm_gem_cma_prime_vunmap(struct drm_gem_object *obj, void *vaddr); 108 108 109 109 struct drm_gem_object * 110 - drm_cma_gem_create_object_default_funcs(struct drm_device *dev, size_t size); 110 + drm_gem_cma_create_object_default_funcs(struct drm_device *dev, size_t size); 111 111 112 112 /** 113 113 * DRM_GEM_CMA_VMAP_DRIVER_OPS - CMA GEM driver operations ensuring a virtual ··· 118 118 * imported buffers. 119 119 */ 120 120 #define DRM_GEM_CMA_VMAP_DRIVER_OPS \ 121 - .gem_create_object = drm_cma_gem_create_object_default_funcs, \ 121 + .gem_create_object = drm_gem_cma_create_object_default_funcs, \ 122 122 .dumb_create = drm_gem_cma_dumb_create, \ 123 123 .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ 124 124 .prime_fd_to_handle = drm_gem_prime_fd_to_handle, \