Commit 20e76f1a authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

dma-buf: Use struct dma_buf_map in dma_buf_vunmap() interfaces 



This patch updates dma_buf_vunmap() and dma-buf's vunmap callback to
use struct dma_buf_map. The interfaces used to receive a buffer address.
This address is now given in an instance of the structure.

Users of the functions are updated accordingly. This is only an interface
change. It is currently expected that dma-buf memory can be accessed with
system memory load/store operations.

v2:
	* include dma-buf-heaps and i915 selftests (kernel test robot)
	* initialize cma_obj before using it in drm_gem_cma_free_object()
	  (kernel test robot)

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarTomasz Figa <tfiga@chromium.org>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200925115601.23955-4-tzimmermann@suse.de
parent 6619ccf1

drivers/dma-buf/dma-buf.c

+4 −4
Original line number Diff line number Diff line
@@ -1236,21 +1236,21 @@ EXPORT_SYMBOL_GPL(dma_buf_vmap); 
/**

 * dma_buf_vunmap - Unmap a vmap obtained by dma_buf_vmap.

 * @dmabuf:	[in]	buffer to vunmap

 * @vaddr:	[in]	vmap to vunmap

 * @map:	[in]	vmap pointer to vunmap

 */

void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)

void dma_buf_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map)

{

	if (WARN_ON(!dmabuf))

		return;



	BUG_ON(dma_buf_map_is_null(&dmabuf->vmap_ptr));

	BUG_ON(dmabuf->vmapping_counter == 0);

	BUG_ON(!dma_buf_map_is_vaddr(&dmabuf->vmap_ptr, vaddr));

	BUG_ON(!dma_buf_map_is_equal(&dmabuf->vmap_ptr, map));



	mutex_lock(&dmabuf->lock);

	if (--dmabuf->vmapping_counter == 0) {

		if (dmabuf->ops->vunmap)

			dmabuf->ops->vunmap(dmabuf, vaddr);

			dmabuf->ops->vunmap(dmabuf, map);

		dma_buf_map_clear(&dmabuf->vmap_ptr);

	}

	mutex_unlock(&dmabuf->lock);

drivers/dma-buf/heaps/heap-helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int dma_heap_dma_buf_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map 
	return 0;

}



static void dma_heap_dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)

static void dma_heap_dma_buf_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map)

{

	struct heap_helper_buffer *buffer = dmabuf->priv;

drivers/gpu/drm/drm_gem_cma_helper.c

+4 −5
Original line number Diff line number Diff line
@@ -175,13 +175,12 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv, 
 */

void drm_gem_cma_free_object(struct drm_gem_object *gem_obj)

{

	struct drm_gem_cma_object *cma_obj;



	cma_obj = to_drm_gem_cma_obj(gem_obj);

	struct drm_gem_cma_object *cma_obj = to_drm_gem_cma_obj(gem_obj);

	struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(cma_obj->vaddr);



	if (gem_obj->import_attach) {

		if (cma_obj->vaddr)

			dma_buf_vunmap(gem_obj->import_attach->dmabuf, cma_obj->vaddr);

			dma_buf_vunmap(gem_obj->import_attach->dmabuf, &map);

		drm_prime_gem_destroy(gem_obj, cma_obj->sgt);

	} else if (cma_obj->vaddr) {

		dma_free_wc(gem_obj->dev->dev, cma_obj->base.size,
@@ -645,7 +644,7 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, 


	obj = drm_gem_cma_prime_import_sg_table(dev, attach, sgt);

	if (IS_ERR(obj)) {

		dma_buf_vunmap(attach->dmabuf, map.vaddr);

		dma_buf_vunmap(attach->dmabuf, &map);

		return obj;

	}

drivers/gpu/drm/drm_gem_shmem_helper.c

+2 −1
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ EXPORT_SYMBOL(drm_gem_shmem_vmap); 
static void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem)

{

	struct drm_gem_object *obj = &shmem->base;

	struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(shmem->vaddr);



	if (WARN_ON_ONCE(!shmem->vmap_use_count))

		return;
@@ -345,7 +346,7 @@ static void drm_gem_shmem_vunmap_locked(struct drm_gem_shmem_object *shmem) 
		return;



	if (obj->import_attach)

		dma_buf_vunmap(obj->import_attach->dmabuf, shmem->vaddr);

		dma_buf_vunmap(obj->import_attach->dmabuf, &map);

	else

		vunmap(shmem->vaddr);

drivers/gpu/drm/drm_prime.c

+3 −3
Original line number Diff line number Diff line
@@ -687,16 +687,16 @@ EXPORT_SYMBOL(drm_gem_dmabuf_vmap); 
/**

 * drm_gem_dmabuf_vunmap - dma_buf vunmap implementation for GEM

 * @dma_buf: buffer to be unmapped

 * @vaddr: the virtual address of the buffer

 * @map: the virtual address of the buffer

 *

 * Releases a kernel virtual mapping. This can be used as the

 * &dma_buf_ops.vunmap callback. Calls into &drm_gem_object_funcs.vunmap for device specific handling.

 */

void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, void *vaddr)

void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, struct dma_buf_map *map)

{

	struct drm_gem_object *obj = dma_buf->priv;



	drm_gem_vunmap(obj, vaddr);

	drm_gem_vunmap(obj, map->vaddr);

}

EXPORT_SYMBOL(drm_gem_dmabuf_vunmap);