Commit c7fbcb71 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/shmem-helper: Export dedicated wrappers for GEM object functions 



Wrap GEM SHMEM functions for struct drm_gem_object_funcs and update
all callers. This will allow for an update of the public interfaces
of the GEM SHMEM helper library.

v2:
	* fix docs for drm_gem_shmem_object_print_info()

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211108093149.7226-3-tzimmermann@suse.de
parent 5a363c20

drivers/gpu/drm/drm_gem_shmem_helper.c

+17 −28
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ 
 */



static const struct drm_gem_object_funcs drm_gem_shmem_funcs = {

	.free = drm_gem_shmem_free_object,

	.print_info = drm_gem_shmem_print_info,

	.pin = drm_gem_shmem_pin,

	.unpin = drm_gem_shmem_unpin,

	.get_sg_table = drm_gem_shmem_get_sg_table,

	.vmap = drm_gem_shmem_vmap,

	.vunmap = drm_gem_shmem_vunmap,

	.mmap = drm_gem_shmem_mmap,

	.free = drm_gem_shmem_object_free,

	.print_info = drm_gem_shmem_object_print_info,

	.pin = drm_gem_shmem_object_pin,

	.unpin = drm_gem_shmem_object_unpin,

	.get_sg_table = drm_gem_shmem_object_get_sg_table,

	.vmap = drm_gem_shmem_object_vmap,

	.vunmap = drm_gem_shmem_object_vunmap,

	.mmap = drm_gem_shmem_object_mmap,

};



static struct drm_gem_shmem_object *
@@ -121,8 +121,7 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_create); 
 * @obj: GEM object to free

 *

 * This function cleans up the GEM object state and frees the memory used to

 * store the object itself. It should be used to implement

 * &drm_gem_object_funcs.free.

 * store the object itself.

 */

void drm_gem_shmem_free_object(struct drm_gem_object *obj)

{
@@ -248,8 +247,7 @@ EXPORT_SYMBOL(drm_gem_shmem_put_pages); 
 * @obj: GEM object

 *

 * This function makes sure the backing pages are pinned in memory while the

 * buffer is exported. It should only be used to implement

 * &drm_gem_object_funcs.pin.

 * buffer is exported.

 *

 * Returns:

 * 0 on success or a negative error code on failure.
@@ -269,7 +267,7 @@ EXPORT_SYMBOL(drm_gem_shmem_pin); 
 * @obj: GEM object

 *

 * This function removes the requirement that the backing pages are pinned in

 * memory. It should only be used to implement &drm_gem_object_funcs.unpin.

 * memory.

 */

void drm_gem_shmem_unpin(struct drm_gem_object *obj)

{
@@ -340,11 +338,8 @@ static int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, struct 
 *       store.

 *

 * This function makes sure that a contiguous kernel virtual address mapping

 * exists for the buffer backing the shmem GEM object.

 *

 * This function can be used to implement &drm_gem_object_funcs.vmap. But it can

 * also be called by drivers directly, in which case it will hide the

 * differences between dma-buf imported and natively allocated objects.

 * exists for the buffer backing the shmem GEM object. It hides the differences

 * between dma-buf imported and natively allocated objects.

 *

 * Acquired mappings should be cleaned up by calling drm_gem_shmem_vunmap().

 *
@@ -396,9 +391,8 @@ static void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem, 
 * drm_gem_shmem_vmap(). The mapping is only removed when the use count drops to

 * zero.

 *

 * This function can be used to implement &drm_gem_object_funcs.vmap. But it can

 * also be called by drivers directly, in which case it will hide the

 * differences between dma-buf imported and natively allocated objects.

 * This function hides the differences between dma-buf imported and natively

 * allocated objects.

 */

void drm_gem_shmem_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map)

{
@@ -604,8 +598,7 @@ static const struct vm_operations_struct drm_gem_shmem_vm_ops = { 
 * @vma: VMA for the area to be mapped

 *

 * This function implements an augmented version of the GEM DRM file mmap

 * operation for shmem objects. Drivers which employ the shmem helpers should

 * use this function as their &drm_gem_object_funcs.mmap handler.

 * operation for shmem objects.

 *

 * Returns:

 * 0 on success or a negative error code on failure.
@@ -646,8 +639,6 @@ EXPORT_SYMBOL_GPL(drm_gem_shmem_mmap); 
 * @p: DRM printer

 * @indent: Tab indentation level

 * @obj: GEM object

 *

 * This implements the &drm_gem_object_funcs.info callback.

 */

void drm_gem_shmem_print_info(struct drm_printer *p, unsigned int indent,

			      const struct drm_gem_object *obj)
@@ -666,9 +657,7 @@ EXPORT_SYMBOL(drm_gem_shmem_print_info); 
 * @obj: GEM object

 *

 * This function exports a scatter/gather table suitable for PRIME usage by

 * calling the standard DMA mapping API. Drivers should not call this function

 * directly, instead it should only be used as an implementation for

 * &drm_gem_object_funcs.get_sg_table.

 * calling the standard DMA mapping API.

 *

 * Drivers who need to acquire an scatter/gather table for objects need to call

 * drm_gem_shmem_get_pages_sgt() instead.

drivers/gpu/drm/lima/lima_gem.c

+4 −4
Original line number Diff line number Diff line
@@ -206,12 +206,12 @@ static const struct drm_gem_object_funcs lima_gem_funcs = { 
	.free = lima_gem_free_object,

	.open = lima_gem_object_open,

	.close = lima_gem_object_close,

	.print_info = drm_gem_shmem_print_info,

	.print_info = drm_gem_shmem_object_print_info,

	.pin = lima_gem_pin,

	.unpin = drm_gem_shmem_unpin,

	.get_sg_table = drm_gem_shmem_get_sg_table,

	.unpin = drm_gem_shmem_object_unpin,

	.get_sg_table = drm_gem_shmem_object_get_sg_table,

	.vmap = lima_gem_vmap,

	.vunmap = drm_gem_shmem_vunmap,

	.vunmap = drm_gem_shmem_object_vunmap,

	.mmap = lima_gem_mmap,

};

drivers/gpu/drm/panfrost/panfrost_gem.c

+6 −6
Original line number Diff line number Diff line
@@ -197,13 +197,13 @@ static const struct drm_gem_object_funcs panfrost_gem_funcs = { 
	.free = panfrost_gem_free_object,

	.open = panfrost_gem_open,

	.close = panfrost_gem_close,

	.print_info = drm_gem_shmem_print_info,

	.print_info = drm_gem_shmem_object_print_info,

	.pin = panfrost_gem_pin,

	.unpin = drm_gem_shmem_unpin,

	.get_sg_table = drm_gem_shmem_get_sg_table,

	.vmap = drm_gem_shmem_vmap,

	.vunmap = drm_gem_shmem_vunmap,

	.mmap = drm_gem_shmem_mmap,

	.unpin = drm_gem_shmem_object_unpin,

	.get_sg_table = drm_gem_shmem_object_get_sg_table,

	.vmap = drm_gem_shmem_object_vmap,

	.vunmap = drm_gem_shmem_object_vunmap,

	.mmap = drm_gem_shmem_object_mmap,

};



/**

drivers/gpu/drm/v3d/v3d_bo.c

+7 −7
Original line number Diff line number Diff line
@@ -52,13 +52,13 @@ void v3d_free_object(struct drm_gem_object *obj) 


static const struct drm_gem_object_funcs v3d_gem_funcs = {

	.free = v3d_free_object,

	.print_info = drm_gem_shmem_print_info,

	.pin = drm_gem_shmem_pin,

	.unpin = drm_gem_shmem_unpin,

	.get_sg_table = drm_gem_shmem_get_sg_table,

	.vmap = drm_gem_shmem_vmap,

	.vunmap = drm_gem_shmem_vunmap,

	.mmap = drm_gem_shmem_mmap,

	.print_info = drm_gem_shmem_object_print_info,

	.pin = drm_gem_shmem_object_pin,

	.unpin = drm_gem_shmem_object_unpin,

	.get_sg_table = drm_gem_shmem_object_get_sg_table,

	.vmap = drm_gem_shmem_object_vmap,

	.vunmap = drm_gem_shmem_object_vunmap,

	.mmap = drm_gem_shmem_object_mmap,

};



/* gem_create_object function for allocating a BO struct and doing

drivers/gpu/drm/virtio/virtgpu_object.c

+7 −8
Original line number Diff line number Diff line
@@ -116,15 +116,14 @@ static const struct drm_gem_object_funcs virtio_gpu_shmem_funcs = { 
	.free = virtio_gpu_free_object,

	.open = virtio_gpu_gem_object_open,

	.close = virtio_gpu_gem_object_close,



	.print_info = drm_gem_shmem_print_info,

	.print_info = drm_gem_shmem_object_print_info,

	.export = virtgpu_gem_prime_export,

	.pin = drm_gem_shmem_pin,

	.unpin = drm_gem_shmem_unpin,

	.get_sg_table = drm_gem_shmem_get_sg_table,

	.vmap = drm_gem_shmem_vmap,

	.vunmap = drm_gem_shmem_vunmap,

	.mmap = drm_gem_shmem_mmap,

	.pin = drm_gem_shmem_object_pin,

	.unpin = drm_gem_shmem_object_unpin,

	.get_sg_table = drm_gem_shmem_object_get_sg_table,

	.vmap = drm_gem_shmem_object_vmap,

	.vunmap = drm_gem_shmem_object_vunmap,

	.mmap = drm_gem_shmem_object_mmap,

};



bool virtio_gpu_is_shmem(struct virtio_gpu_object *bo)