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

Commit 09ea0dfb authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

dma-buf: make map_atomic and map function pointers optional 



So drivers don't need dummy functions just returning NULL.

Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarOleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20180529135918.19729-1-kraxel@redhat.com
parent e065a8dd

drivers/dma-buf/dma-buf.c

+4 −0
Original line number Diff line number Diff line
@@ -872,6 +872,8 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num) 
{

	WARN_ON(!dmabuf);



	if (!dmabuf->ops->map_atomic)

		return NULL;

	return dmabuf->ops->map_atomic(dmabuf, page_num);

}

EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
@@ -907,6 +909,8 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num) 
{

	WARN_ON(!dmabuf);



	if (!dmabuf->ops->map)

		return NULL;

	return dmabuf->ops->map(dmabuf, page_num);

}

EXPORT_SYMBOL_GPL(dma_buf_kmap);

include/linux/dma-buf.h

+2 −2
Original line number Diff line number Diff line
@@ -39,12 +39,12 @@ struct dma_buf_attachment; 


/**

 * struct dma_buf_ops - operations possible on struct dma_buf

 * @map_atomic: maps a page from the buffer into kernel address

 * @map_atomic: [optional] maps a page from the buffer into kernel address

 *		space, users may not block until the subsequent unmap call.

 *		This callback must not sleep.

 * @unmap_atomic: [optional] unmaps a atomically mapped page from the buffer.

 *		  This Callback must not sleep.

 * @map: maps a page from the buffer into kernel address space.

 * @map: [optional] maps a page from the buffer into kernel address space.

 * @unmap: [optional] unmaps a page from the buffer.

 * @vmap: [optional] creates a virtual mapping for the buffer into kernel

 *	  address space. Same restrictions as for vmap and friends apply.