Commit 16b0314a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

dma-buf: move dma-buf symbols into the DMA_BUF module namespace 



In order to better track where in the kernel the dma-buf code is used,
put the symbols in the namespace DMA_BUF and modify all users of the
symbols to properly import the namespace to not break the build at the
same time.

Now the output of modinfo shows the use of these symbols, making it
easier to watch for users over time:

$ modinfo drivers/misc/fastrpc.ko | grep import
import_ns:      DMA_BUF

Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: dri-devel@lists.freedesktop.org
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20211010124628.17691-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d46e58ef

drivers/dma-buf/dma-buf.c

+17 −17
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) 
	module_put(exp_info->owner);

	return ERR_PTR(ret);

}

EXPORT_SYMBOL_GPL(dma_buf_export);

EXPORT_SYMBOL_NS_GPL(dma_buf_export, DMA_BUF);



/**

 * dma_buf_fd - returns a file descriptor for the given struct dma_buf
@@ -634,7 +634,7 @@ int dma_buf_fd(struct dma_buf *dmabuf, int flags) 


	return fd;

}

EXPORT_SYMBOL_GPL(dma_buf_fd);

EXPORT_SYMBOL_NS_GPL(dma_buf_fd, DMA_BUF);



/**

 * dma_buf_get - returns the struct dma_buf related to an fd
@@ -660,7 +660,7 @@ struct dma_buf *dma_buf_get(int fd) 


	return file->private_data;

}

EXPORT_SYMBOL_GPL(dma_buf_get);

EXPORT_SYMBOL_NS_GPL(dma_buf_get, DMA_BUF);



/**

 * dma_buf_put - decreases refcount of the buffer
@@ -679,7 +679,7 @@ void dma_buf_put(struct dma_buf *dmabuf) 


	fput(dmabuf->file);

}

EXPORT_SYMBOL_GPL(dma_buf_put);

EXPORT_SYMBOL_NS_GPL(dma_buf_put, DMA_BUF);



static void mangle_sg_table(struct sg_table *sg_table)

{
@@ -810,7 +810,7 @@ dma_buf_dynamic_attach(struct dma_buf *dmabuf, struct device *dev, 
	dma_buf_detach(dmabuf, attach);

	return ERR_PTR(ret);

}

EXPORT_SYMBOL_GPL(dma_buf_dynamic_attach);

EXPORT_SYMBOL_NS_GPL(dma_buf_dynamic_attach, DMA_BUF);



/**

 * dma_buf_attach - Wrapper for dma_buf_dynamic_attach
@@ -825,7 +825,7 @@ struct dma_buf_attachment *dma_buf_attach(struct dma_buf *dmabuf, 
{

	return dma_buf_dynamic_attach(dmabuf, dev, NULL, NULL);

}

EXPORT_SYMBOL_GPL(dma_buf_attach);

EXPORT_SYMBOL_NS_GPL(dma_buf_attach, DMA_BUF);



static void __unmap_dma_buf(struct dma_buf_attachment *attach,

			    struct sg_table *sg_table,
@@ -871,7 +871,7 @@ void dma_buf_detach(struct dma_buf *dmabuf, struct dma_buf_attachment *attach) 


	kfree(attach);

}

EXPORT_SYMBOL_GPL(dma_buf_detach);

EXPORT_SYMBOL_NS_GPL(dma_buf_detach, DMA_BUF);



/**

 * dma_buf_pin - Lock down the DMA-buf
@@ -901,7 +901,7 @@ int dma_buf_pin(struct dma_buf_attachment *attach) 


	return ret;

}

EXPORT_SYMBOL_GPL(dma_buf_pin);

EXPORT_SYMBOL_NS_GPL(dma_buf_pin, DMA_BUF);



/**

 * dma_buf_unpin - Unpin a DMA-buf
@@ -922,7 +922,7 @@ void dma_buf_unpin(struct dma_buf_attachment *attach) 
	if (dmabuf->ops->unpin)

		dmabuf->ops->unpin(attach);

}

EXPORT_SYMBOL_GPL(dma_buf_unpin);

EXPORT_SYMBOL_NS_GPL(dma_buf_unpin, DMA_BUF);



/**

 * dma_buf_map_attachment - Returns the scatterlist table of the attachment;
@@ -1012,7 +1012,7 @@ struct sg_table *dma_buf_map_attachment(struct dma_buf_attachment *attach, 
#endif /* CONFIG_DMA_API_DEBUG */

	return sg_table;

}

EXPORT_SYMBOL_GPL(dma_buf_map_attachment);

EXPORT_SYMBOL_NS_GPL(dma_buf_map_attachment, DMA_BUF);



/**

 * dma_buf_unmap_attachment - unmaps and decreases usecount of the buffer;might
@@ -1048,7 +1048,7 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *attach, 
	    !IS_ENABLED(CONFIG_DMABUF_MOVE_NOTIFY))

		dma_buf_unpin(attach);

}

EXPORT_SYMBOL_GPL(dma_buf_unmap_attachment);

EXPORT_SYMBOL_NS_GPL(dma_buf_unmap_attachment, DMA_BUF);



/**

 * dma_buf_move_notify - notify attachments that DMA-buf is moving
@@ -1068,7 +1068,7 @@ void dma_buf_move_notify(struct dma_buf *dmabuf) 
		if (attach->importer_ops)

			attach->importer_ops->move_notify(attach);

}

EXPORT_SYMBOL_GPL(dma_buf_move_notify);

EXPORT_SYMBOL_NS_GPL(dma_buf_move_notify, DMA_BUF);



/**

 * DOC: cpu access
@@ -1212,7 +1212,7 @@ int dma_buf_begin_cpu_access(struct dma_buf *dmabuf, 


	return ret;

}

EXPORT_SYMBOL_GPL(dma_buf_begin_cpu_access);

EXPORT_SYMBOL_NS_GPL(dma_buf_begin_cpu_access, DMA_BUF);



/**

 * dma_buf_end_cpu_access - Must be called after accessing a dma_buf from the
@@ -1240,7 +1240,7 @@ int dma_buf_end_cpu_access(struct dma_buf *dmabuf, 


	return ret;

}

EXPORT_SYMBOL_GPL(dma_buf_end_cpu_access);

EXPORT_SYMBOL_NS_GPL(dma_buf_end_cpu_access, DMA_BUF);





/**
@@ -1282,7 +1282,7 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, 


	return dmabuf->ops->mmap(dmabuf, vma);

}

EXPORT_SYMBOL_GPL(dma_buf_mmap);

EXPORT_SYMBOL_NS_GPL(dma_buf_mmap, DMA_BUF);



/**

 * dma_buf_vmap - Create virtual mapping for the buffer object into kernel
@@ -1336,7 +1336,7 @@ int dma_buf_vmap(struct dma_buf *dmabuf, struct dma_buf_map *map) 
	mutex_unlock(&dmabuf->lock);

	return ret;

}

EXPORT_SYMBOL_GPL(dma_buf_vmap);

EXPORT_SYMBOL_NS_GPL(dma_buf_vmap, DMA_BUF);



/**

 * dma_buf_vunmap - Unmap a vmap obtained by dma_buf_vmap.
@@ -1360,7 +1360,7 @@ void dma_buf_vunmap(struct dma_buf *dmabuf, struct dma_buf_map *map) 
	}

	mutex_unlock(&dmabuf->lock);

}

EXPORT_SYMBOL_GPL(dma_buf_vunmap);

EXPORT_SYMBOL_NS_GPL(dma_buf_vunmap, DMA_BUF);



#ifdef CONFIG_DEBUG_FS

static int dma_buf_debug_show(struct seq_file *s, void *unused)

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/swiotlb.h>

#include <linux/dma-buf.h>

#include <linux/sizes.h>

#include <linux/module.h>



#include <drm/ttm/ttm_bo_api.h>

#include <drm/ttm/ttm_bo_driver.h>
@@ -59,6 +60,8 @@ 
#include "amdgpu_res_cursor.h"

#include "bif/bif_4_1_d.h"



MODULE_IMPORT_NS(DMA_BUF);



#define AMDGPU_TTM_VRAM_MAX_DW_READ	(size_t)128



static int amdgpu_ttm_backend_bind(struct ttm_device *bdev,

drivers/gpu/drm/armada/armada_gem.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
#include "armada_gem.h"

#include "armada_ioctlP.h"



MODULE_IMPORT_NS(DMA_BUF);



static vm_fault_t armada_gem_vm_fault(struct vm_fault *vmf)

{

	struct drm_gem_object *gobj = vmf->vma->vm_private_data;

drivers/gpu/drm/drm_gem_framebuffer_helper.c

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <linux/slab.h>

#include <linux/module.h>



#include <drm/drm_damage_helper.h>

#include <drm/drm_fb_helper.h>
@@ -17,6 +18,8 @@ 


#include "drm_internal.h"



MODULE_IMPORT_NS(DMA_BUF);



#define AFBC_HEADER_SIZE		16

#define AFBC_TH_LAYOUT_ALIGNMENT	8

#define AFBC_HDR_ALIGN			64

drivers/gpu/drm/drm_prime.c

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/export.h>

#include <linux/dma-buf.h>

#include <linux/rbtree.h>

#include <linux/module.h>



#include <drm/drm.h>

#include <drm/drm_drv.h>
@@ -39,6 +40,8 @@ 


#include "drm_internal.h"



MODULE_IMPORT_NS(DMA_BUF);



/**

 * DOC: overview and lifetime rules

 *