* [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
@ 2017-04-19 19:36 ` Logan Gunthorpe
0 siblings, 0 replies; 13+ messages in thread
From: Logan Gunthorpe @ 2017-04-19 19:36 UTC (permalink / raw)
To: linux-kernel, intel-gfx, linux-media, dri-devel, linux-tegra, devel
Cc: David Airlie, Thierry Reding, Arve Hjønnevåg,
Daniel Vetter, Sumit Semwal, Marek Szyprowski, Alexandre Courbot,
Thomas Hellstrom, Sinclair Yeh, Russell King, Christoph Hellwig,
Tomi Valkeinen, VMware Graphics, Laura Abbott, Pawel Osciak,
Stephen Warren, Riley Andrews, Mauro Carvalho Chehab,
Greg Kroah-Hartman, Kyungmin Park, Logan Gunthorpe
Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
in highmem.h, the former can be aliased if any dma-buf user includes
that header.
I'm personally trying to include highmem.h inside scatterlist.h and this
breaks the dma-buf code proper.
Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
To maintain consistency I've renamed all four of kmap* and kunmap* to be
map* and unmap*. (Even though only kmap_atomic presently conflicts.)
[1] https://www.spinics.net/lists/target-devel/msg15070.html
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
---
Changes since v1:
- Added the missing tegra driver (noticed by kbuild robot)
- Rebased off of drm-intel-next to get the i915 selftest that is new
- Fixed nits Sinclair pointed out.
drivers/dma-buf/dma-buf.c | 16 ++++++++--------
drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
drivers/gpu/drm/drm_prime.c | 8 ++++----
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
drivers/gpu/drm/tegra/gem.c | 8 ++++----
drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
drivers/staging/android/ion/ion.c | 8 ++++----
include/linux/dma-buf.h | 22 +++++++++++-----------
14 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index f72aaac..512bdbc 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
|| !exp_info->ops->map_dma_buf
|| !exp_info->ops->unmap_dma_buf
|| !exp_info->ops->release
- || !exp_info->ops->kmap_atomic
- || !exp_info->ops->kmap
+ || !exp_info->ops->map_atomic
+ || !exp_info->ops->map
|| !exp_info->ops->mmap)) {
return ERR_PTR(-EINVAL);
}
@@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num)
{
WARN_ON(!dmabuf);
- return dmabuf->ops->kmap_atomic(dmabuf, page_num);
+ return dmabuf->ops->map_atomic(dmabuf, page_num);
}
EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
@@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num,
{
WARN_ON(!dmabuf);
- if (dmabuf->ops->kunmap_atomic)
- dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
+ if (dmabuf->ops->unmap_atomic)
+ dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
}
EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
@@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
{
WARN_ON(!dmabuf);
- return dmabuf->ops->kmap(dmabuf, page_num);
+ return dmabuf->ops->map(dmabuf, page_num);
}
EXPORT_SYMBOL_GPL(dma_buf_kmap);
@@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num,
{
WARN_ON(!dmabuf);
- if (dmabuf->ops->kunmap)
- dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
+ if (dmabuf->ops->unmap)
+ dmabuf->ops->unmap(dmabuf, page_num, vaddr);
}
EXPORT_SYMBOL_GPL(dma_buf_kunmap);
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 1597458..d6c2a5d 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
.map_dma_buf = armada_gem_prime_map_dma_buf,
.unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
.release = drm_gem_dmabuf_release,
- .kmap_atomic = armada_gem_dmabuf_no_kmap,
- .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
- .kmap = armada_gem_dmabuf_no_kmap,
- .kunmap = armada_gem_dmabuf_no_kunmap,
+ .map_atomic = armada_gem_dmabuf_no_kmap,
+ .unmap_atomic = armada_gem_dmabuf_no_kunmap,
+ .map = armada_gem_dmabuf_no_kmap,
+ .unmap = armada_gem_dmabuf_no_kunmap,
.mmap = armada_gem_dmabuf_mmap,
};
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 9fb65b7..954eb84 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
.map_dma_buf = drm_gem_map_dma_buf,
.unmap_dma_buf = drm_gem_unmap_dma_buf,
.release = drm_gem_dmabuf_release,
- .kmap = drm_gem_dmabuf_kmap,
- .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
- .kunmap = drm_gem_dmabuf_kunmap,
- .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
+ .map = drm_gem_dmabuf_kmap,
+ .map_atomic = drm_gem_dmabuf_kmap_atomic,
+ .unmap = drm_gem_dmabuf_kunmap,
+ .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
.mmap = drm_gem_dmabuf_mmap,
.vmap = drm_gem_dmabuf_vmap,
.vunmap = drm_gem_dmabuf_vunmap,
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 11898cd..f225bf6 100644
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
.map_dma_buf = i915_gem_map_dma_buf,
.unmap_dma_buf = i915_gem_unmap_dma_buf,
.release = drm_gem_dmabuf_release,
- .kmap = i915_gem_dmabuf_kmap,
- .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
- .kunmap = i915_gem_dmabuf_kunmap,
- .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
+ .map = i915_gem_dmabuf_kmap,
+ .map_atomic = i915_gem_dmabuf_kmap_atomic,
+ .unmap = i915_gem_dmabuf_kunmap,
+ .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
.mmap = i915_gem_dmabuf_mmap,
.vmap = i915_gem_dmabuf_vmap,
.vunmap = i915_gem_dmabuf_vunmap,
diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
index 99da8f4..302f7d1 100644
--- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
+++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
@@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = {
.map_dma_buf = mock_map_dma_buf,
.unmap_dma_buf = mock_unmap_dma_buf,
.release = mock_dmabuf_release,
- .kmap = mock_dmabuf_kmap,
- .kmap_atomic = mock_dmabuf_kmap_atomic,
- .kunmap = mock_dmabuf_kunmap,
- .kunmap_atomic = mock_dmabuf_kunmap_atomic,
+ .map = mock_dmabuf_kmap,
+ .map_atomic = mock_dmabuf_kmap_atomic,
+ .unmap = mock_dmabuf_kunmap,
+ .unmap_atomic = mock_dmabuf_kunmap_atomic,
.mmap = mock_dmabuf_mmap,
.vmap = mock_dmabuf_vmap,
.vunmap = mock_dmabuf_vunmap,
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index ee5883f..0dbe030 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
.release = omap_gem_dmabuf_release,
.begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
.end_cpu_access = omap_gem_dmabuf_end_cpu_access,
- .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
- .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
- .kmap = omap_gem_dmabuf_kmap,
- .kunmap = omap_gem_dmabuf_kunmap,
+ .map_atomic = omap_gem_dmabuf_kmap_atomic,
+ .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
+ .map = omap_gem_dmabuf_kmap,
+ .unmap = omap_gem_dmabuf_kunmap,
.mmap = omap_gem_dmabuf_mmap,
};
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 17e62ec..8672f5d 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
.map_dma_buf = tegra_gem_prime_map_dma_buf,
.unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
.release = tegra_gem_prime_release,
- .kmap_atomic = tegra_gem_prime_kmap_atomic,
- .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
- .kmap = tegra_gem_prime_kmap,
- .kunmap = tegra_gem_prime_kunmap,
+ .map_atomic = tegra_gem_prime_kmap_atomic,
+ .unmap_atomic = tegra_gem_prime_kunmap_atomic,
+ .map = tegra_gem_prime_kmap,
+ .unmap = tegra_gem_prime_kunmap,
.mmap = tegra_gem_prime_mmap,
.vmap = tegra_gem_prime_vmap,
.vunmap = tegra_gem_prime_vunmap,
diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
index ac90ffd..ed0e636 100644
--- a/drivers/gpu/drm/udl/udl_dmabuf.c
+++ b/drivers/gpu/drm/udl/udl_dmabuf.c
@@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
.detach = udl_detach_dma_buf,
.map_dma_buf = udl_map_dma_buf,
.unmap_dma_buf = udl_unmap_dma_buf,
- .kmap = udl_dmabuf_kmap,
- .kmap_atomic = udl_dmabuf_kmap_atomic,
- .kunmap = udl_dmabuf_kunmap,
- .kunmap_atomic = udl_dmabuf_kunmap_atomic,
+ .map = udl_dmabuf_kmap,
+ .map_atomic = udl_dmabuf_kmap_atomic,
+ .unmap = udl_dmabuf_kunmap,
+ .unmap_atomic = udl_dmabuf_kunmap_atomic,
.mmap = udl_dmabuf_mmap,
.release = drm_gem_dmabuf_release,
};
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
index 31fe32d..0d42a46 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
@@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
.map_dma_buf = vmw_prime_map_dma_buf,
.unmap_dma_buf = vmw_prime_unmap_dma_buf,
.release = NULL,
- .kmap = vmw_prime_dmabuf_kmap,
- .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
- .kunmap = vmw_prime_dmabuf_kunmap,
- .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
+ .map = vmw_prime_dmabuf_kmap,
+ .map_atomic = vmw_prime_dmabuf_kmap_atomic,
+ .unmap = vmw_prime_dmabuf_kunmap,
+ .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
.mmap = vmw_prime_dmabuf_mmap,
.vmap = vmw_prime_dmabuf_vmap,
.vunmap = vmw_prime_dmabuf_vunmap,
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index fb6a177..2db0413 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
.detach = vb2_dc_dmabuf_ops_detach,
.map_dma_buf = vb2_dc_dmabuf_ops_map,
.unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
- .kmap = vb2_dc_dmabuf_ops_kmap,
- .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
+ .map = vb2_dc_dmabuf_ops_kmap,
+ .map_atomic = vb2_dc_dmabuf_ops_kmap,
.vmap = vb2_dc_dmabuf_ops_vmap,
.mmap = vb2_dc_dmabuf_ops_mmap,
.release = vb2_dc_dmabuf_ops_release,
diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index ecff8f4..6fd1343 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
.detach = vb2_dma_sg_dmabuf_ops_detach,
.map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
.unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
- .kmap = vb2_dma_sg_dmabuf_ops_kmap,
- .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
+ .map = vb2_dma_sg_dmabuf_ops_kmap,
+ .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
.vmap = vb2_dma_sg_dmabuf_ops_vmap,
.mmap = vb2_dma_sg_dmabuf_ops_mmap,
.release = vb2_dma_sg_dmabuf_ops_release,
diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
index 3f77814..27d1db3 100644
--- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
@@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
.detach = vb2_vmalloc_dmabuf_ops_detach,
.map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
.unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
- .kmap = vb2_vmalloc_dmabuf_ops_kmap,
- .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
+ .map = vb2_vmalloc_dmabuf_ops_kmap,
+ .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
.vmap = vb2_vmalloc_dmabuf_ops_vmap,
.mmap = vb2_vmalloc_dmabuf_ops_mmap,
.release = vb2_vmalloc_dmabuf_ops_release,
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index f45115f..95a7f16 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
.release = ion_dma_buf_release,
.begin_cpu_access = ion_dma_buf_begin_cpu_access,
.end_cpu_access = ion_dma_buf_end_cpu_access,
- .kmap_atomic = ion_dma_buf_kmap,
- .kunmap_atomic = ion_dma_buf_kunmap,
- .kmap = ion_dma_buf_kmap,
- .kunmap = ion_dma_buf_kunmap,
+ .map_atomic = ion_dma_buf_kmap,
+ .unmap_atomic = ion_dma_buf_kunmap,
+ .map = ion_dma_buf_kmap,
+ .unmap = ion_dma_buf_kunmap,
};
struct dma_buf *ion_share_dma_buf(struct ion_client *client,
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index bfb3704..79f27d6 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -39,13 +39,13 @@ struct dma_buf_attachment;
/**
* struct dma_buf_ops - operations possible on struct dma_buf
- * @kmap_atomic: maps a page from the buffer into kernel address
- * space, users may not block until the subsequent unmap call.
- * This callback must not sleep.
- * @kunmap_atomic: [optional] unmaps a atomically mapped page from the buffer.
- * This Callback must not sleep.
- * @kmap: maps a page from the buffer into kernel address space.
- * @kunmap: [optional] unmaps a page from the buffer.
+ * @map_atomic: 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.
+ * @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.
* @vunmap: [optional] unmaps a vmap from the buffer
@@ -206,10 +206,10 @@ struct dma_buf_ops {
* to be restarted.
*/
int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
- void *(*kmap_atomic)(struct dma_buf *, unsigned long);
- void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
- void *(*kmap)(struct dma_buf *, unsigned long);
- void (*kunmap)(struct dma_buf *, unsigned long, void *);
+ void *(*map_atomic)(struct dma_buf *, unsigned long);
+ void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
+ void *(*map)(struct dma_buf *, unsigned long);
+ void (*unmap)(struct dma_buf *, unsigned long, void *);
/**
* @mmap:
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
@ 2017-04-19 19:36 ` Logan Gunthorpe
0 siblings, 0 replies; 13+ messages in thread
From: Logan Gunthorpe @ 2017-04-19 19:36 UTC (permalink / raw)
To: linux-kernel, intel-gfx, linux-media, dri-devel, linux-tegra, devel
Cc: Christoph Hellwig, Sumit Semwal, Russell King, David Airlie,
Daniel Vetter, Jani Nikula, Sean Paul, Tomi Valkeinen,
Thierry Reding, Stephen Warren, Alexandre Courbot,
VMware Graphics, Sinclair Yeh, Thomas Hellstrom, Pawel Osciak,
Marek Szyprowski, Kyungmin Park, Mauro Carvalho Chehab,
Laura Abbott, Greg Kroah-Hartman, Arve Hjønnevåg,
Riley Andrews, Logan Gunthorpe
Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
in highmem.h, the former can be aliased if any dma-buf user includes
that header.
I'm personally trying to include highmem.h inside scatterlist.h and this
breaks the dma-buf code proper.
Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
To maintain consistency I've renamed all four of kmap* and kunmap* to be
map* and unmap*. (Even though only kmap_atomic presently conflicts.)
[1] https://www.spinics.net/lists/target-devel/msg15070.html
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
---
Changes since v1:
- Added the missing tegra driver (noticed by kbuild robot)
- Rebased off of drm-intel-next to get the i915 selftest that is new
- Fixed nits Sinclair pointed out.
drivers/dma-buf/dma-buf.c | 16 ++++++++--------
drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
drivers/gpu/drm/drm_prime.c | 8 ++++----
drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
drivers/gpu/drm/tegra/gem.c | 8 ++++----
drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
drivers/staging/android/ion/ion.c | 8 ++++----
include/linux/dma-buf.h | 22 +++++++++++-----------
14 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index f72aaac..512bdbc 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
|| !exp_info->ops->map_dma_buf
|| !exp_info->ops->unmap_dma_buf
|| !exp_info->ops->release
- || !exp_info->ops->kmap_atomic
- || !exp_info->ops->kmap
+ || !exp_info->ops->map_atomic
+ || !exp_info->ops->map
|| !exp_info->ops->mmap)) {
return ERR_PTR(-EINVAL);
}
@@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num)
{
WARN_ON(!dmabuf);
- return dmabuf->ops->kmap_atomic(dmabuf, page_num);
+ return dmabuf->ops->map_atomic(dmabuf, page_num);
}
EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
@@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num,
{
WARN_ON(!dmabuf);
- if (dmabuf->ops->kunmap_atomic)
- dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
+ if (dmabuf->ops->unmap_atomic)
+ dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
}
EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
@@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
{
WARN_ON(!dmabuf);
- return dmabuf->ops->kmap(dmabuf, page_num);
+ return dmabuf->ops->map(dmabuf, page_num);
}
EXPORT_SYMBOL_GPL(dma_buf_kmap);
@@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num,
{
WARN_ON(!dmabuf);
- if (dmabuf->ops->kunmap)
- dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
+ if (dmabuf->ops->unmap)
+ dmabuf->ops->unmap(dmabuf, page_num, vaddr);
}
EXPORT_SYMBOL_GPL(dma_buf_kunmap);
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 1597458..d6c2a5d 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
.map_dma_buf = armada_gem_prime_map_dma_buf,
.unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
.release = drm_gem_dmabuf_release,
- .kmap_atomic = armada_gem_dmabuf_no_kmap,
- .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
- .kmap = armada_gem_dmabuf_no_kmap,
- .kunmap = armada_gem_dmabuf_no_kunmap,
+ .map_atomic = armada_gem_dmabuf_no_kmap,
+ .unmap_atomic = armada_gem_dmabuf_no_kunmap,
+ .map = armada_gem_dmabuf_no_kmap,
+ .unmap = armada_gem_dmabuf_no_kunmap,
.mmap = armada_gem_dmabuf_mmap,
};
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 9fb65b7..954eb84 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
.map_dma_buf = drm_gem_map_dma_buf,
.unmap_dma_buf = drm_gem_unmap_dma_buf,
.release = drm_gem_dmabuf_release,
- .kmap = drm_gem_dmabuf_kmap,
- .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
- .kunmap = drm_gem_dmabuf_kunmap,
- .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
+ .map = drm_gem_dmabuf_kmap,
+ .map_atomic = drm_gem_dmabuf_kmap_atomic,
+ .unmap = drm_gem_dmabuf_kunmap,
+ .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
.mmap = drm_gem_dmabuf_mmap,
.vmap = drm_gem_dmabuf_vmap,
.vunmap = drm_gem_dmabuf_vunmap,
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 11898cd..f225bf6 100644
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
.map_dma_buf = i915_gem_map_dma_buf,
.unmap_dma_buf = i915_gem_unmap_dma_buf,
.release = drm_gem_dmabuf_release,
- .kmap = i915_gem_dmabuf_kmap,
- .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
- .kunmap = i915_gem_dmabuf_kunmap,
- .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
+ .map = i915_gem_dmabuf_kmap,
+ .map_atomic = i915_gem_dmabuf_kmap_atomic,
+ .unmap = i915_gem_dmabuf_kunmap,
+ .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
.mmap = i915_gem_dmabuf_mmap,
.vmap = i915_gem_dmabuf_vmap,
.vunmap = i915_gem_dmabuf_vunmap,
diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
index 99da8f4..302f7d1 100644
--- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
+++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
@@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = {
.map_dma_buf = mock_map_dma_buf,
.unmap_dma_buf = mock_unmap_dma_buf,
.release = mock_dmabuf_release,
- .kmap = mock_dmabuf_kmap,
- .kmap_atomic = mock_dmabuf_kmap_atomic,
- .kunmap = mock_dmabuf_kunmap,
- .kunmap_atomic = mock_dmabuf_kunmap_atomic,
+ .map = mock_dmabuf_kmap,
+ .map_atomic = mock_dmabuf_kmap_atomic,
+ .unmap = mock_dmabuf_kunmap,
+ .unmap_atomic = mock_dmabuf_kunmap_atomic,
.mmap = mock_dmabuf_mmap,
.vmap = mock_dmabuf_vmap,
.vunmap = mock_dmabuf_vunmap,
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index ee5883f..0dbe030 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
.release = omap_gem_dmabuf_release,
.begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
.end_cpu_access = omap_gem_dmabuf_end_cpu_access,
- .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
- .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
- .kmap = omap_gem_dmabuf_kmap,
- .kunmap = omap_gem_dmabuf_kunmap,
+ .map_atomic = omap_gem_dmabuf_kmap_atomic,
+ .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
+ .map = omap_gem_dmabuf_kmap,
+ .unmap = omap_gem_dmabuf_kunmap,
.mmap = omap_gem_dmabuf_mmap,
};
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 17e62ec..8672f5d 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
.map_dma_buf = tegra_gem_prime_map_dma_buf,
.unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
.release = tegra_gem_prime_release,
- .kmap_atomic = tegra_gem_prime_kmap_atomic,
- .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
- .kmap = tegra_gem_prime_kmap,
- .kunmap = tegra_gem_prime_kunmap,
+ .map_atomic = tegra_gem_prime_kmap_atomic,
+ .unmap_atomic = tegra_gem_prime_kunmap_atomic,
+ .map = tegra_gem_prime_kmap,
+ .unmap = tegra_gem_prime_kunmap,
.mmap = tegra_gem_prime_mmap,
.vmap = tegra_gem_prime_vmap,
.vunmap = tegra_gem_prime_vunmap,
diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
index ac90ffd..ed0e636 100644
--- a/drivers/gpu/drm/udl/udl_dmabuf.c
+++ b/drivers/gpu/drm/udl/udl_dmabuf.c
@@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
.detach = udl_detach_dma_buf,
.map_dma_buf = udl_map_dma_buf,
.unmap_dma_buf = udl_unmap_dma_buf,
- .kmap = udl_dmabuf_kmap,
- .kmap_atomic = udl_dmabuf_kmap_atomic,
- .kunmap = udl_dmabuf_kunmap,
- .kunmap_atomic = udl_dmabuf_kunmap_atomic,
+ .map = udl_dmabuf_kmap,
+ .map_atomic = udl_dmabuf_kmap_atomic,
+ .unmap = udl_dmabuf_kunmap,
+ .unmap_atomic = udl_dmabuf_kunmap_atomic,
.mmap = udl_dmabuf_mmap,
.release = drm_gem_dmabuf_release,
};
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
index 31fe32d..0d42a46 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
@@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
.map_dma_buf = vmw_prime_map_dma_buf,
.unmap_dma_buf = vmw_prime_unmap_dma_buf,
.release = NULL,
- .kmap = vmw_prime_dmabuf_kmap,
- .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
- .kunmap = vmw_prime_dmabuf_kunmap,
- .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
+ .map = vmw_prime_dmabuf_kmap,
+ .map_atomic = vmw_prime_dmabuf_kmap_atomic,
+ .unmap = vmw_prime_dmabuf_kunmap,
+ .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
.mmap = vmw_prime_dmabuf_mmap,
.vmap = vmw_prime_dmabuf_vmap,
.vunmap = vmw_prime_dmabuf_vunmap,
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index fb6a177..2db0413 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
.detach = vb2_dc_dmabuf_ops_detach,
.map_dma_buf = vb2_dc_dmabuf_ops_map,
.unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
- .kmap = vb2_dc_dmabuf_ops_kmap,
- .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
+ .map = vb2_dc_dmabuf_ops_kmap,
+ .map_atomic = vb2_dc_dmabuf_ops_kmap,
.vmap = vb2_dc_dmabuf_ops_vmap,
.mmap = vb2_dc_dmabuf_ops_mmap,
.release = vb2_dc_dmabuf_ops_release,
diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index ecff8f4..6fd1343 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
.detach = vb2_dma_sg_dmabuf_ops_detach,
.map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
.unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
- .kmap = vb2_dma_sg_dmabuf_ops_kmap,
- .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
+ .map = vb2_dma_sg_dmabuf_ops_kmap,
+ .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
.vmap = vb2_dma_sg_dmabuf_ops_vmap,
.mmap = vb2_dma_sg_dmabuf_ops_mmap,
.release = vb2_dma_sg_dmabuf_ops_release,
diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
index 3f77814..27d1db3 100644
--- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
@@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
.detach = vb2_vmalloc_dmabuf_ops_detach,
.map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
.unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
- .kmap = vb2_vmalloc_dmabuf_ops_kmap,
- .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
+ .map = vb2_vmalloc_dmabuf_ops_kmap,
+ .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
.vmap = vb2_vmalloc_dmabuf_ops_vmap,
.mmap = vb2_vmalloc_dmabuf_ops_mmap,
.release = vb2_vmalloc_dmabuf_ops_release,
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index f45115f..95a7f16 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
.release = ion_dma_buf_release,
.begin_cpu_access = ion_dma_buf_begin_cpu_access,
.end_cpu_access = ion_dma_buf_end_cpu_access,
- .kmap_atomic = ion_dma_buf_kmap,
- .kunmap_atomic = ion_dma_buf_kunmap,
- .kmap = ion_dma_buf_kmap,
- .kunmap = ion_dma_buf_kunmap,
+ .map_atomic = ion_dma_buf_kmap,
+ .unmap_atomic = ion_dma_buf_kunmap,
+ .map = ion_dma_buf_kmap,
+ .unmap = ion_dma_buf_kunmap,
};
struct dma_buf *ion_share_dma_buf(struct ion_client *client,
diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
index bfb3704..79f27d6 100644
--- a/include/linux/dma-buf.h
+++ b/include/linux/dma-buf.h
@@ -39,13 +39,13 @@ struct dma_buf_attachment;
/**
* struct dma_buf_ops - operations possible on struct dma_buf
- * @kmap_atomic: maps a page from the buffer into kernel address
- * space, users may not block until the subsequent unmap call.
- * This callback must not sleep.
- * @kunmap_atomic: [optional] unmaps a atomically mapped page from the buffer.
- * This Callback must not sleep.
- * @kmap: maps a page from the buffer into kernel address space.
- * @kunmap: [optional] unmaps a page from the buffer.
+ * @map_atomic: 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.
+ * @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.
* @vunmap: [optional] unmaps a vmap from the buffer
@@ -206,10 +206,10 @@ struct dma_buf_ops {
* to be restarted.
*/
int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
- void *(*kmap_atomic)(struct dma_buf *, unsigned long);
- void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
- void *(*kmap)(struct dma_buf *, unsigned long);
- void (*kunmap)(struct dma_buf *, unsigned long, void *);
+ void *(*map_atomic)(struct dma_buf *, unsigned long);
+ void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
+ void *(*map)(struct dma_buf *, unsigned long);
+ void (*unmap)(struct dma_buf *, unsigned long, void *);
/**
* @mmap:
--
2.1.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* ✓ Fi.CI.BAT: success for dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro (rev2)
2017-04-19 19:36 ` Logan Gunthorpe
(?)
@ 2017-04-19 19:57 ` Patchwork
-1 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2017-04-19 19:57 UTC (permalink / raw)
To: Logan Gunthorpe; +Cc: intel-gfx
== Series Details ==
Series: dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro (rev2)
URL : https://patchwork.freedesktop.org/series/23207/
State : success
== Summary ==
Series 23207v2 dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
https://patchwork.freedesktop.org/api/1.0/series/23207/revisions/2/mbox/
Test kms_flip:
Subgroup basic-flip-vs-dpms:
pass -> DMESG-WARN (fi-byt-j1900) fdo#100652
fdo#100652 https://bugs.freedesktop.org/show_bug.cgi?id=100652
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:435s
fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:424s
fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:579s
fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:504s
fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:544s
fi-byt-j1900 total:278 pass:253 dwarn:1 dfail:0 fail:0 skip:24 time:486s
fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:483s
fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:410s
fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:406s
fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:423s
fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:488s
fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:466s
fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:461s
fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:568s
fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:445s
fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:573s
fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:462s
fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:487s
fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:429s
fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:535s
fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:403s
1b757084743a73fa672e92b4e5cf00a291667dfc drm-tip: 2017y-04m-19d-12h-50m-15s UTC integration manifest
212adc7 dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4520/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
2017-04-19 19:36 ` Logan Gunthorpe
@ 2017-04-20 0:28 ` Laura Abbott
-1 siblings, 0 replies; 13+ messages in thread
From: Laura Abbott @ 2017-04-20 0:28 UTC (permalink / raw)
To: Logan Gunthorpe, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-media-u79uwXL29TY76Z2rM5mHXA,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b
Cc: Christoph Hellwig, Sumit Semwal, Russell King, David Airlie,
Daniel Vetter, Jani Nikula, Sean Paul, Tomi Valkeinen,
Thierry Reding, Stephen Warren, Alexandre Courbot,
VMware Graphics, Sinclair Yeh, Thomas Hellstrom, Pawel Osciak,
Marek Szyprowski, Kyungmin Park, Mauro Carvalho Chehab,
Greg Kroah-Hartman
On 04/19/2017 12:36 PM, Logan Gunthorpe wrote:
> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
> in highmem.h, the former can be aliased if any dma-buf user includes
> that header.
>
> I'm personally trying to include highmem.h inside scatterlist.h and this
> breaks the dma-buf code proper.
>
> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>
> To maintain consistency I've renamed all four of kmap* and kunmap* to be
> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>
> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>
> Signed-off-by: Logan Gunthorpe <logang-OTvnGxWRz7hWk0Htik3J/w@public.gmane.org>
> Reviewed-by: Sinclair Yeh <syeh-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org>
> ---
>
> Changes since v1:
>
> - Added the missing tegra driver (noticed by kbuild robot)
> - Rebased off of drm-intel-next to get the i915 selftest that is new
> - Fixed nits Sinclair pointed out.
>
> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
> drivers/gpu/drm/drm_prime.c | 8 ++++----
> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
> drivers/gpu/drm/tegra/gem.c | 8 ++++----
> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
> drivers/staging/android/ion/ion.c | 8 ++++----
> include/linux/dma-buf.h | 22 +++++++++++-----------
> 14 files changed, 61 insertions(+), 61 deletions(-)
>
For Ion,
Acked-by: Laura Abbott <labbott-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
I did some major Ion refactoring but I don't think this
will conflict.
Thanks,
Laura
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
@ 2017-04-20 0:28 ` Laura Abbott
0 siblings, 0 replies; 13+ messages in thread
From: Laura Abbott @ 2017-04-20 0:28 UTC (permalink / raw)
To: Logan Gunthorpe, linux-kernel, intel-gfx, linux-media, dri-devel,
linux-tegra, devel
Cc: Christoph Hellwig, Sumit Semwal, Russell King, David Airlie,
Daniel Vetter, Jani Nikula, Sean Paul, Tomi Valkeinen,
Thierry Reding, Stephen Warren, Alexandre Courbot,
VMware Graphics, Sinclair Yeh, Thomas Hellstrom, Pawel Osciak,
Marek Szyprowski, Kyungmin Park, Mauro Carvalho Chehab,
Greg Kroah-Hartman, Arve Hjønnevåg, Riley Andrews
On 04/19/2017 12:36 PM, Logan Gunthorpe wrote:
> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
> in highmem.h, the former can be aliased if any dma-buf user includes
> that header.
>
> I'm personally trying to include highmem.h inside scatterlist.h and this
> breaks the dma-buf code proper.
>
> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>
> To maintain consistency I've renamed all four of kmap* and kunmap* to be
> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>
> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
> ---
>
> Changes since v1:
>
> - Added the missing tegra driver (noticed by kbuild robot)
> - Rebased off of drm-intel-next to get the i915 selftest that is new
> - Fixed nits Sinclair pointed out.
>
> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
> drivers/gpu/drm/drm_prime.c | 8 ++++----
> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
> drivers/gpu/drm/tegra/gem.c | 8 ++++----
> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
> drivers/staging/android/ion/ion.c | 8 ++++----
> include/linux/dma-buf.h | 22 +++++++++++-----------
> 14 files changed, 61 insertions(+), 61 deletions(-)
>
For Ion,
Acked-by: Laura Abbott <labbott@redhat.com>
I did some major Ion refactoring but I don't think this
will conflict.
Thanks,
Laura
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
2017-04-19 19:36 ` Logan Gunthorpe
@ 2017-04-20 7:51 ` Daniel Vetter
-1 siblings, 0 replies; 13+ messages in thread
From: Daniel Vetter @ 2017-04-20 7:51 UTC (permalink / raw)
To: Logan Gunthorpe
Cc: dri-devel, Daniel Vetter, Christoph Hellwig, Marek Szyprowski,
devel, Alexandre Courbot, Thomas Hellstrom, Russell King,
Tomi Valkeinen, VMware Graphics, Kyungmin Park, linux-media,
Pawel Osciak, Stephen Warren, intel-gfx, Riley Andrews,
linux-tegra, Mauro Carvalho Chehab, Greg Kroah-Hartman,
linux-kernel, Arve Hjønnevåg
On Wed, Apr 19, 2017 at 01:36:10PM -0600, Logan Gunthorpe wrote:
> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
> in highmem.h, the former can be aliased if any dma-buf user includes
> that header.
>
> I'm personally trying to include highmem.h inside scatterlist.h and this
> breaks the dma-buf code proper.
>
> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>
> To maintain consistency I've renamed all four of kmap* and kunmap* to be
> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>
> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Probably simplest if we pull this in through the drm-misc tree for 4.12.
Can we have an ack for the v4l side for that pls?
Thanks, Daniel
> ---
>
> Changes since v1:
>
> - Added the missing tegra driver (noticed by kbuild robot)
> - Rebased off of drm-intel-next to get the i915 selftest that is new
> - Fixed nits Sinclair pointed out.
>
> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
> drivers/gpu/drm/drm_prime.c | 8 ++++----
> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
> drivers/gpu/drm/tegra/gem.c | 8 ++++----
> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
> drivers/staging/android/ion/ion.c | 8 ++++----
> include/linux/dma-buf.h | 22 +++++++++++-----------
> 14 files changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
> index f72aaac..512bdbc 100644
> --- a/drivers/dma-buf/dma-buf.c
> +++ b/drivers/dma-buf/dma-buf.c
> @@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
> || !exp_info->ops->map_dma_buf
> || !exp_info->ops->unmap_dma_buf
> || !exp_info->ops->release
> - || !exp_info->ops->kmap_atomic
> - || !exp_info->ops->kmap
> + || !exp_info->ops->map_atomic
> + || !exp_info->ops->map
> || !exp_info->ops->mmap)) {
> return ERR_PTR(-EINVAL);
> }
> @@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num)
> {
> WARN_ON(!dmabuf);
>
> - return dmabuf->ops->kmap_atomic(dmabuf, page_num);
> + return dmabuf->ops->map_atomic(dmabuf, page_num);
> }
> EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
>
> @@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num,
> {
> WARN_ON(!dmabuf);
>
> - if (dmabuf->ops->kunmap_atomic)
> - dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
> + if (dmabuf->ops->unmap_atomic)
> + dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
> }
> EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
>
> @@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
> {
> WARN_ON(!dmabuf);
>
> - return dmabuf->ops->kmap(dmabuf, page_num);
> + return dmabuf->ops->map(dmabuf, page_num);
> }
> EXPORT_SYMBOL_GPL(dma_buf_kmap);
>
> @@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num,
> {
> WARN_ON(!dmabuf);
>
> - if (dmabuf->ops->kunmap)
> - dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
> + if (dmabuf->ops->unmap)
> + dmabuf->ops->unmap(dmabuf, page_num, vaddr);
> }
> EXPORT_SYMBOL_GPL(dma_buf_kunmap);
>
> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> index 1597458..d6c2a5d 100644
> --- a/drivers/gpu/drm/armada/armada_gem.c
> +++ b/drivers/gpu/drm/armada/armada_gem.c
> @@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
> .map_dma_buf = armada_gem_prime_map_dma_buf,
> .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
> .release = drm_gem_dmabuf_release,
> - .kmap_atomic = armada_gem_dmabuf_no_kmap,
> - .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
> - .kmap = armada_gem_dmabuf_no_kmap,
> - .kunmap = armada_gem_dmabuf_no_kunmap,
> + .map_atomic = armada_gem_dmabuf_no_kmap,
> + .unmap_atomic = armada_gem_dmabuf_no_kunmap,
> + .map = armada_gem_dmabuf_no_kmap,
> + .unmap = armada_gem_dmabuf_no_kunmap,
> .mmap = armada_gem_dmabuf_mmap,
> };
>
> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
> index 9fb65b7..954eb84 100644
> --- a/drivers/gpu/drm/drm_prime.c
> +++ b/drivers/gpu/drm/drm_prime.c
> @@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
> .map_dma_buf = drm_gem_map_dma_buf,
> .unmap_dma_buf = drm_gem_unmap_dma_buf,
> .release = drm_gem_dmabuf_release,
> - .kmap = drm_gem_dmabuf_kmap,
> - .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
> - .kunmap = drm_gem_dmabuf_kunmap,
> - .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
> + .map = drm_gem_dmabuf_kmap,
> + .map_atomic = drm_gem_dmabuf_kmap_atomic,
> + .unmap = drm_gem_dmabuf_kunmap,
> + .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
> .mmap = drm_gem_dmabuf_mmap,
> .vmap = drm_gem_dmabuf_vmap,
> .vunmap = drm_gem_dmabuf_vunmap,
> diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
> index 11898cd..f225bf6 100644
> --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
> +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
> @@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
> .map_dma_buf = i915_gem_map_dma_buf,
> .unmap_dma_buf = i915_gem_unmap_dma_buf,
> .release = drm_gem_dmabuf_release,
> - .kmap = i915_gem_dmabuf_kmap,
> - .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
> - .kunmap = i915_gem_dmabuf_kunmap,
> - .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
> + .map = i915_gem_dmabuf_kmap,
> + .map_atomic = i915_gem_dmabuf_kmap_atomic,
> + .unmap = i915_gem_dmabuf_kunmap,
> + .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
> .mmap = i915_gem_dmabuf_mmap,
> .vmap = i915_gem_dmabuf_vmap,
> .vunmap = i915_gem_dmabuf_vunmap,
> diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
> index 99da8f4..302f7d1 100644
> --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
> +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
> @@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = {
> .map_dma_buf = mock_map_dma_buf,
> .unmap_dma_buf = mock_unmap_dma_buf,
> .release = mock_dmabuf_release,
> - .kmap = mock_dmabuf_kmap,
> - .kmap_atomic = mock_dmabuf_kmap_atomic,
> - .kunmap = mock_dmabuf_kunmap,
> - .kunmap_atomic = mock_dmabuf_kunmap_atomic,
> + .map = mock_dmabuf_kmap,
> + .map_atomic = mock_dmabuf_kmap_atomic,
> + .unmap = mock_dmabuf_kunmap,
> + .unmap_atomic = mock_dmabuf_kunmap_atomic,
> .mmap = mock_dmabuf_mmap,
> .vmap = mock_dmabuf_vmap,
> .vunmap = mock_dmabuf_vunmap,
> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> index ee5883f..0dbe030 100644
> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> @@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
> .release = omap_gem_dmabuf_release,
> .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
> .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
> - .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
> - .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
> - .kmap = omap_gem_dmabuf_kmap,
> - .kunmap = omap_gem_dmabuf_kunmap,
> + .map_atomic = omap_gem_dmabuf_kmap_atomic,
> + .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
> + .map = omap_gem_dmabuf_kmap,
> + .unmap = omap_gem_dmabuf_kunmap,
> .mmap = omap_gem_dmabuf_mmap,
> };
>
> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
> index 17e62ec..8672f5d 100644
> --- a/drivers/gpu/drm/tegra/gem.c
> +++ b/drivers/gpu/drm/tegra/gem.c
> @@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
> .map_dma_buf = tegra_gem_prime_map_dma_buf,
> .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
> .release = tegra_gem_prime_release,
> - .kmap_atomic = tegra_gem_prime_kmap_atomic,
> - .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
> - .kmap = tegra_gem_prime_kmap,
> - .kunmap = tegra_gem_prime_kunmap,
> + .map_atomic = tegra_gem_prime_kmap_atomic,
> + .unmap_atomic = tegra_gem_prime_kunmap_atomic,
> + .map = tegra_gem_prime_kmap,
> + .unmap = tegra_gem_prime_kunmap,
> .mmap = tegra_gem_prime_mmap,
> .vmap = tegra_gem_prime_vmap,
> .vunmap = tegra_gem_prime_vunmap,
> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
> index ac90ffd..ed0e636 100644
> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
> @@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
> .detach = udl_detach_dma_buf,
> .map_dma_buf = udl_map_dma_buf,
> .unmap_dma_buf = udl_unmap_dma_buf,
> - .kmap = udl_dmabuf_kmap,
> - .kmap_atomic = udl_dmabuf_kmap_atomic,
> - .kunmap = udl_dmabuf_kunmap,
> - .kunmap_atomic = udl_dmabuf_kunmap_atomic,
> + .map = udl_dmabuf_kmap,
> + .map_atomic = udl_dmabuf_kmap_atomic,
> + .unmap = udl_dmabuf_kunmap,
> + .unmap_atomic = udl_dmabuf_kunmap_atomic,
> .mmap = udl_dmabuf_mmap,
> .release = drm_gem_dmabuf_release,
> };
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
> index 31fe32d..0d42a46 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
> @@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
> .map_dma_buf = vmw_prime_map_dma_buf,
> .unmap_dma_buf = vmw_prime_unmap_dma_buf,
> .release = NULL,
> - .kmap = vmw_prime_dmabuf_kmap,
> - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
> - .kunmap = vmw_prime_dmabuf_kunmap,
> - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
> + .map = vmw_prime_dmabuf_kmap,
> + .map_atomic = vmw_prime_dmabuf_kmap_atomic,
> + .unmap = vmw_prime_dmabuf_kunmap,
> + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
> .mmap = vmw_prime_dmabuf_mmap,
> .vmap = vmw_prime_dmabuf_vmap,
> .vunmap = vmw_prime_dmabuf_vunmap,
> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> index fb6a177..2db0413 100644
> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> @@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
> .detach = vb2_dc_dmabuf_ops_detach,
> .map_dma_buf = vb2_dc_dmabuf_ops_map,
> .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
> - .kmap = vb2_dc_dmabuf_ops_kmap,
> - .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
> + .map = vb2_dc_dmabuf_ops_kmap,
> + .map_atomic = vb2_dc_dmabuf_ops_kmap,
> .vmap = vb2_dc_dmabuf_ops_vmap,
> .mmap = vb2_dc_dmabuf_ops_mmap,
> .release = vb2_dc_dmabuf_ops_release,
> diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
> index ecff8f4..6fd1343 100644
> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
> @@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
> .detach = vb2_dma_sg_dmabuf_ops_detach,
> .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
> .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
> - .kmap = vb2_dma_sg_dmabuf_ops_kmap,
> - .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
> + .map = vb2_dma_sg_dmabuf_ops_kmap,
> + .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
> .vmap = vb2_dma_sg_dmabuf_ops_vmap,
> .mmap = vb2_dma_sg_dmabuf_ops_mmap,
> .release = vb2_dma_sg_dmabuf_ops_release,
> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
> index 3f77814..27d1db3 100644
> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
> @@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
> .detach = vb2_vmalloc_dmabuf_ops_detach,
> .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
> .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
> - .kmap = vb2_vmalloc_dmabuf_ops_kmap,
> - .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
> + .map = vb2_vmalloc_dmabuf_ops_kmap,
> + .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
> .vmap = vb2_vmalloc_dmabuf_ops_vmap,
> .mmap = vb2_vmalloc_dmabuf_ops_mmap,
> .release = vb2_vmalloc_dmabuf_ops_release,
> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
> index f45115f..95a7f16 100644
> --- a/drivers/staging/android/ion/ion.c
> +++ b/drivers/staging/android/ion/ion.c
> @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
> .release = ion_dma_buf_release,
> .begin_cpu_access = ion_dma_buf_begin_cpu_access,
> .end_cpu_access = ion_dma_buf_end_cpu_access,
> - .kmap_atomic = ion_dma_buf_kmap,
> - .kunmap_atomic = ion_dma_buf_kunmap,
> - .kmap = ion_dma_buf_kmap,
> - .kunmap = ion_dma_buf_kunmap,
> + .map_atomic = ion_dma_buf_kmap,
> + .unmap_atomic = ion_dma_buf_kunmap,
> + .map = ion_dma_buf_kmap,
> + .unmap = ion_dma_buf_kunmap,
> };
>
> struct dma_buf *ion_share_dma_buf(struct ion_client *client,
> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
> index bfb3704..79f27d6 100644
> --- a/include/linux/dma-buf.h
> +++ b/include/linux/dma-buf.h
> @@ -39,13 +39,13 @@ struct dma_buf_attachment;
>
> /**
> * struct dma_buf_ops - operations possible on struct dma_buf
> - * @kmap_atomic: maps a page from the buffer into kernel address
> - * space, users may not block until the subsequent unmap call.
> - * This callback must not sleep.
> - * @kunmap_atomic: [optional] unmaps a atomically mapped page from the buffer.
> - * This Callback must not sleep.
> - * @kmap: maps a page from the buffer into kernel address space.
> - * @kunmap: [optional] unmaps a page from the buffer.
> + * @map_atomic: 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.
> + * @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.
> * @vunmap: [optional] unmaps a vmap from the buffer
> @@ -206,10 +206,10 @@ struct dma_buf_ops {
> * to be restarted.
> */
> int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
> - void *(*kmap_atomic)(struct dma_buf *, unsigned long);
> - void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
> - void *(*kmap)(struct dma_buf *, unsigned long);
> - void (*kunmap)(struct dma_buf *, unsigned long, void *);
> + void *(*map_atomic)(struct dma_buf *, unsigned long);
> + void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
> + void *(*map)(struct dma_buf *, unsigned long);
> + void (*unmap)(struct dma_buf *, unsigned long, void *);
>
> /**
> * @mmap:
> --
> 2.1.4
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
@ 2017-04-20 7:51 ` Daniel Vetter
0 siblings, 0 replies; 13+ messages in thread
From: Daniel Vetter @ 2017-04-20 7:51 UTC (permalink / raw)
To: Logan Gunthorpe
Cc: linux-kernel, intel-gfx, linux-media, dri-devel, linux-tegra,
devel, David Airlie, Thierry Reding, Arve Hjønnevåg,
Daniel Vetter, Sumit Semwal, Marek Szyprowski, Alexandre Courbot,
Thomas Hellstrom, Sinclair Yeh, Russell King, Christoph Hellwig,
Tomi Valkeinen, VMware Graphics, Laura Abbott, Pawel Osciak,
Stephen Warren, Riley Andrews, Mauro Carvalho Chehab,
Greg Kroah-Hartman, Kyungmin Park
On Wed, Apr 19, 2017 at 01:36:10PM -0600, Logan Gunthorpe wrote:
> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
> in highmem.h, the former can be aliased if any dma-buf user includes
> that header.
>
> I'm personally trying to include highmem.h inside scatterlist.h and this
> breaks the dma-buf code proper.
>
> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>
> To maintain consistency I've renamed all four of kmap* and kunmap* to be
> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>
> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Probably simplest if we pull this in through the drm-misc tree for 4.12.
Can we have an ack for the v4l side for that pls?
Thanks, Daniel
> ---
>
> Changes since v1:
>
> - Added the missing tegra driver (noticed by kbuild robot)
> - Rebased off of drm-intel-next to get the i915 selftest that is new
> - Fixed nits Sinclair pointed out.
>
> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
> drivers/gpu/drm/drm_prime.c | 8 ++++----
> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
> drivers/gpu/drm/tegra/gem.c | 8 ++++----
> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
> drivers/staging/android/ion/ion.c | 8 ++++----
> include/linux/dma-buf.h | 22 +++++++++++-----------
> 14 files changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
> index f72aaac..512bdbc 100644
> --- a/drivers/dma-buf/dma-buf.c
> +++ b/drivers/dma-buf/dma-buf.c
> @@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
> || !exp_info->ops->map_dma_buf
> || !exp_info->ops->unmap_dma_buf
> || !exp_info->ops->release
> - || !exp_info->ops->kmap_atomic
> - || !exp_info->ops->kmap
> + || !exp_info->ops->map_atomic
> + || !exp_info->ops->map
> || !exp_info->ops->mmap)) {
> return ERR_PTR(-EINVAL);
> }
> @@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num)
> {
> WARN_ON(!dmabuf);
>
> - return dmabuf->ops->kmap_atomic(dmabuf, page_num);
> + return dmabuf->ops->map_atomic(dmabuf, page_num);
> }
> EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
>
> @@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num,
> {
> WARN_ON(!dmabuf);
>
> - if (dmabuf->ops->kunmap_atomic)
> - dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
> + if (dmabuf->ops->unmap_atomic)
> + dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
> }
> EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
>
> @@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
> {
> WARN_ON(!dmabuf);
>
> - return dmabuf->ops->kmap(dmabuf, page_num);
> + return dmabuf->ops->map(dmabuf, page_num);
> }
> EXPORT_SYMBOL_GPL(dma_buf_kmap);
>
> @@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num,
> {
> WARN_ON(!dmabuf);
>
> - if (dmabuf->ops->kunmap)
> - dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
> + if (dmabuf->ops->unmap)
> + dmabuf->ops->unmap(dmabuf, page_num, vaddr);
> }
> EXPORT_SYMBOL_GPL(dma_buf_kunmap);
>
> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> index 1597458..d6c2a5d 100644
> --- a/drivers/gpu/drm/armada/armada_gem.c
> +++ b/drivers/gpu/drm/armada/armada_gem.c
> @@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
> .map_dma_buf = armada_gem_prime_map_dma_buf,
> .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
> .release = drm_gem_dmabuf_release,
> - .kmap_atomic = armada_gem_dmabuf_no_kmap,
> - .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
> - .kmap = armada_gem_dmabuf_no_kmap,
> - .kunmap = armada_gem_dmabuf_no_kunmap,
> + .map_atomic = armada_gem_dmabuf_no_kmap,
> + .unmap_atomic = armada_gem_dmabuf_no_kunmap,
> + .map = armada_gem_dmabuf_no_kmap,
> + .unmap = armada_gem_dmabuf_no_kunmap,
> .mmap = armada_gem_dmabuf_mmap,
> };
>
> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
> index 9fb65b7..954eb84 100644
> --- a/drivers/gpu/drm/drm_prime.c
> +++ b/drivers/gpu/drm/drm_prime.c
> @@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
> .map_dma_buf = drm_gem_map_dma_buf,
> .unmap_dma_buf = drm_gem_unmap_dma_buf,
> .release = drm_gem_dmabuf_release,
> - .kmap = drm_gem_dmabuf_kmap,
> - .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
> - .kunmap = drm_gem_dmabuf_kunmap,
> - .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
> + .map = drm_gem_dmabuf_kmap,
> + .map_atomic = drm_gem_dmabuf_kmap_atomic,
> + .unmap = drm_gem_dmabuf_kunmap,
> + .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
> .mmap = drm_gem_dmabuf_mmap,
> .vmap = drm_gem_dmabuf_vmap,
> .vunmap = drm_gem_dmabuf_vunmap,
> diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
> index 11898cd..f225bf6 100644
> --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
> +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
> @@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
> .map_dma_buf = i915_gem_map_dma_buf,
> .unmap_dma_buf = i915_gem_unmap_dma_buf,
> .release = drm_gem_dmabuf_release,
> - .kmap = i915_gem_dmabuf_kmap,
> - .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
> - .kunmap = i915_gem_dmabuf_kunmap,
> - .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
> + .map = i915_gem_dmabuf_kmap,
> + .map_atomic = i915_gem_dmabuf_kmap_atomic,
> + .unmap = i915_gem_dmabuf_kunmap,
> + .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
> .mmap = i915_gem_dmabuf_mmap,
> .vmap = i915_gem_dmabuf_vmap,
> .vunmap = i915_gem_dmabuf_vunmap,
> diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
> index 99da8f4..302f7d1 100644
> --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
> +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
> @@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = {
> .map_dma_buf = mock_map_dma_buf,
> .unmap_dma_buf = mock_unmap_dma_buf,
> .release = mock_dmabuf_release,
> - .kmap = mock_dmabuf_kmap,
> - .kmap_atomic = mock_dmabuf_kmap_atomic,
> - .kunmap = mock_dmabuf_kunmap,
> - .kunmap_atomic = mock_dmabuf_kunmap_atomic,
> + .map = mock_dmabuf_kmap,
> + .map_atomic = mock_dmabuf_kmap_atomic,
> + .unmap = mock_dmabuf_kunmap,
> + .unmap_atomic = mock_dmabuf_kunmap_atomic,
> .mmap = mock_dmabuf_mmap,
> .vmap = mock_dmabuf_vmap,
> .vunmap = mock_dmabuf_vunmap,
> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> index ee5883f..0dbe030 100644
> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
> @@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
> .release = omap_gem_dmabuf_release,
> .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
> .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
> - .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
> - .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
> - .kmap = omap_gem_dmabuf_kmap,
> - .kunmap = omap_gem_dmabuf_kunmap,
> + .map_atomic = omap_gem_dmabuf_kmap_atomic,
> + .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
> + .map = omap_gem_dmabuf_kmap,
> + .unmap = omap_gem_dmabuf_kunmap,
> .mmap = omap_gem_dmabuf_mmap,
> };
>
> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
> index 17e62ec..8672f5d 100644
> --- a/drivers/gpu/drm/tegra/gem.c
> +++ b/drivers/gpu/drm/tegra/gem.c
> @@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
> .map_dma_buf = tegra_gem_prime_map_dma_buf,
> .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
> .release = tegra_gem_prime_release,
> - .kmap_atomic = tegra_gem_prime_kmap_atomic,
> - .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
> - .kmap = tegra_gem_prime_kmap,
> - .kunmap = tegra_gem_prime_kunmap,
> + .map_atomic = tegra_gem_prime_kmap_atomic,
> + .unmap_atomic = tegra_gem_prime_kunmap_atomic,
> + .map = tegra_gem_prime_kmap,
> + .unmap = tegra_gem_prime_kunmap,
> .mmap = tegra_gem_prime_mmap,
> .vmap = tegra_gem_prime_vmap,
> .vunmap = tegra_gem_prime_vunmap,
> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
> index ac90ffd..ed0e636 100644
> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
> @@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
> .detach = udl_detach_dma_buf,
> .map_dma_buf = udl_map_dma_buf,
> .unmap_dma_buf = udl_unmap_dma_buf,
> - .kmap = udl_dmabuf_kmap,
> - .kmap_atomic = udl_dmabuf_kmap_atomic,
> - .kunmap = udl_dmabuf_kunmap,
> - .kunmap_atomic = udl_dmabuf_kunmap_atomic,
> + .map = udl_dmabuf_kmap,
> + .map_atomic = udl_dmabuf_kmap_atomic,
> + .unmap = udl_dmabuf_kunmap,
> + .unmap_atomic = udl_dmabuf_kunmap_atomic,
> .mmap = udl_dmabuf_mmap,
> .release = drm_gem_dmabuf_release,
> };
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
> index 31fe32d..0d42a46 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
> @@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
> .map_dma_buf = vmw_prime_map_dma_buf,
> .unmap_dma_buf = vmw_prime_unmap_dma_buf,
> .release = NULL,
> - .kmap = vmw_prime_dmabuf_kmap,
> - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
> - .kunmap = vmw_prime_dmabuf_kunmap,
> - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
> + .map = vmw_prime_dmabuf_kmap,
> + .map_atomic = vmw_prime_dmabuf_kmap_atomic,
> + .unmap = vmw_prime_dmabuf_kunmap,
> + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
> .mmap = vmw_prime_dmabuf_mmap,
> .vmap = vmw_prime_dmabuf_vmap,
> .vunmap = vmw_prime_dmabuf_vunmap,
> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> index fb6a177..2db0413 100644
> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
> @@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
> .detach = vb2_dc_dmabuf_ops_detach,
> .map_dma_buf = vb2_dc_dmabuf_ops_map,
> .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
> - .kmap = vb2_dc_dmabuf_ops_kmap,
> - .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
> + .map = vb2_dc_dmabuf_ops_kmap,
> + .map_atomic = vb2_dc_dmabuf_ops_kmap,
> .vmap = vb2_dc_dmabuf_ops_vmap,
> .mmap = vb2_dc_dmabuf_ops_mmap,
> .release = vb2_dc_dmabuf_ops_release,
> diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
> index ecff8f4..6fd1343 100644
> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
> @@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
> .detach = vb2_dma_sg_dmabuf_ops_detach,
> .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
> .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
> - .kmap = vb2_dma_sg_dmabuf_ops_kmap,
> - .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
> + .map = vb2_dma_sg_dmabuf_ops_kmap,
> + .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
> .vmap = vb2_dma_sg_dmabuf_ops_vmap,
> .mmap = vb2_dma_sg_dmabuf_ops_mmap,
> .release = vb2_dma_sg_dmabuf_ops_release,
> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
> index 3f77814..27d1db3 100644
> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
> @@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
> .detach = vb2_vmalloc_dmabuf_ops_detach,
> .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
> .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
> - .kmap = vb2_vmalloc_dmabuf_ops_kmap,
> - .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
> + .map = vb2_vmalloc_dmabuf_ops_kmap,
> + .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
> .vmap = vb2_vmalloc_dmabuf_ops_vmap,
> .mmap = vb2_vmalloc_dmabuf_ops_mmap,
> .release = vb2_vmalloc_dmabuf_ops_release,
> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
> index f45115f..95a7f16 100644
> --- a/drivers/staging/android/ion/ion.c
> +++ b/drivers/staging/android/ion/ion.c
> @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
> .release = ion_dma_buf_release,
> .begin_cpu_access = ion_dma_buf_begin_cpu_access,
> .end_cpu_access = ion_dma_buf_end_cpu_access,
> - .kmap_atomic = ion_dma_buf_kmap,
> - .kunmap_atomic = ion_dma_buf_kunmap,
> - .kmap = ion_dma_buf_kmap,
> - .kunmap = ion_dma_buf_kunmap,
> + .map_atomic = ion_dma_buf_kmap,
> + .unmap_atomic = ion_dma_buf_kunmap,
> + .map = ion_dma_buf_kmap,
> + .unmap = ion_dma_buf_kunmap,
> };
>
> struct dma_buf *ion_share_dma_buf(struct ion_client *client,
> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
> index bfb3704..79f27d6 100644
> --- a/include/linux/dma-buf.h
> +++ b/include/linux/dma-buf.h
> @@ -39,13 +39,13 @@ struct dma_buf_attachment;
>
> /**
> * struct dma_buf_ops - operations possible on struct dma_buf
> - * @kmap_atomic: maps a page from the buffer into kernel address
> - * space, users may not block until the subsequent unmap call.
> - * This callback must not sleep.
> - * @kunmap_atomic: [optional] unmaps a atomically mapped page from the buffer.
> - * This Callback must not sleep.
> - * @kmap: maps a page from the buffer into kernel address space.
> - * @kunmap: [optional] unmaps a page from the buffer.
> + * @map_atomic: 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.
> + * @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.
> * @vunmap: [optional] unmaps a vmap from the buffer
> @@ -206,10 +206,10 @@ struct dma_buf_ops {
> * to be restarted.
> */
> int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
> - void *(*kmap_atomic)(struct dma_buf *, unsigned long);
> - void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
> - void *(*kmap)(struct dma_buf *, unsigned long);
> - void (*kunmap)(struct dma_buf *, unsigned long, void *);
> + void *(*map_atomic)(struct dma_buf *, unsigned long);
> + void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
> + void *(*map)(struct dma_buf *, unsigned long);
> + void (*unmap)(struct dma_buf *, unsigned long, void *);
>
> /**
> * @mmap:
> --
> 2.1.4
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
2017-04-20 7:51 ` Daniel Vetter
@ 2017-04-20 8:01 ` Sumit Semwal
-1 siblings, 0 replies; 13+ messages in thread
From: Sumit Semwal @ 2017-04-20 8:01 UTC (permalink / raw)
To: Logan Gunthorpe, LKML, Intel Graphics Development, linux-media,
DRI mailing list, linux-tegra, devel, David Airlie,
Thierry Reding, Arve Hjønnevåg, Daniel Vetter,
Sumit Semwal, Marek Szyprowski, Alexandre Courbot,
Thomas Hellstrom, Sinclair Yeh, Russell King, Christoph Hellwig,
Tomi Valkeinen, VMware Graphics, Laura Abbott
Hi Logan,
Thanks for the patch.
On 20 April 2017 at 13:21, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Wed, Apr 19, 2017 at 01:36:10PM -0600, Logan Gunthorpe wrote:
>> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
>> in highmem.h, the former can be aliased if any dma-buf user includes
>> that header.
>>
>> I'm personally trying to include highmem.h inside scatterlist.h and this
>> breaks the dma-buf code proper.
>>
>> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>>
>> To maintain consistency I've renamed all four of kmap* and kunmap* to be
>> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>>
>> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>>
>> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
>> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
>
> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
>
> Probably simplest if we pull this in through the drm-misc tree for 4.12.
> Can we have an ack for the v4l side for that pls?
>
> Thanks, Daniel
>
>> ---
>>
>> Changes since v1:
>>
>> - Added the missing tegra driver (noticed by kbuild robot)
>> - Rebased off of drm-intel-next to get the i915 selftest that is new
>> - Fixed nits Sinclair pointed out.
>>
>> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
>> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
>> drivers/gpu/drm/drm_prime.c | 8 ++++----
>> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/tegra/gem.c | 8 ++++----
>> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
>> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
>> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
>> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
>> drivers/staging/android/ion/ion.c | 8 ++++----
>> include/linux/dma-buf.h | 22 +++++++++++-----------
>> 14 files changed, 61 insertions(+), 61 deletions(-)
>>
>> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
>> index f72aaac..512bdbc 100644
>> --- a/drivers/dma-buf/dma-buf.c
>> +++ b/drivers/dma-buf/dma-buf.c
>> @@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
>> || !exp_info->ops->map_dma_buf
>> || !exp_info->ops->unmap_dma_buf
>> || !exp_info->ops->release
>> - || !exp_info->ops->kmap_atomic
>> - || !exp_info->ops->kmap
>> + || !exp_info->ops->map_atomic
>> + || !exp_info->ops->map
>> || !exp_info->ops->mmap)) {
>> return ERR_PTR(-EINVAL);
>> }
>> @@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num)
>> {
>> WARN_ON(!dmabuf);
>>
>> - return dmabuf->ops->kmap_atomic(dmabuf, page_num);
>> + return dmabuf->ops->map_atomic(dmabuf, page_num);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
>>
>> @@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num,
>> {
>> WARN_ON(!dmabuf);
>>
>> - if (dmabuf->ops->kunmap_atomic)
>> - dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
>> + if (dmabuf->ops->unmap_atomic)
>> + dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
>>
>> @@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
>> {
>> WARN_ON(!dmabuf);
>>
>> - return dmabuf->ops->kmap(dmabuf, page_num);
>> + return dmabuf->ops->map(dmabuf, page_num);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kmap);
>>
>> @@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num,
>> {
>> WARN_ON(!dmabuf);
>>
>> - if (dmabuf->ops->kunmap)
>> - dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
>> + if (dmabuf->ops->unmap)
>> + dmabuf->ops->unmap(dmabuf, page_num, vaddr);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kunmap);
>>
>> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
>> index 1597458..d6c2a5d 100644
>> --- a/drivers/gpu/drm/armada/armada_gem.c
>> +++ b/drivers/gpu/drm/armada/armada_gem.c
>> @@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
>> .map_dma_buf = armada_gem_prime_map_dma_buf,
>> .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap_atomic = armada_gem_dmabuf_no_kmap,
>> - .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
>> - .kmap = armada_gem_dmabuf_no_kmap,
>> - .kunmap = armada_gem_dmabuf_no_kunmap,
>> + .map_atomic = armada_gem_dmabuf_no_kmap,
>> + .unmap_atomic = armada_gem_dmabuf_no_kunmap,
>> + .map = armada_gem_dmabuf_no_kmap,
>> + .unmap = armada_gem_dmabuf_no_kunmap,
>> .mmap = armada_gem_dmabuf_mmap,
>> };
>>
>> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
>> index 9fb65b7..954eb84 100644
>> --- a/drivers/gpu/drm/drm_prime.c
>> +++ b/drivers/gpu/drm/drm_prime.c
>> @@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
>> .map_dma_buf = drm_gem_map_dma_buf,
>> .unmap_dma_buf = drm_gem_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap = drm_gem_dmabuf_kmap,
>> - .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
>> - .kunmap = drm_gem_dmabuf_kunmap,
>> - .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>> + .map = drm_gem_dmabuf_kmap,
>> + .map_atomic = drm_gem_dmabuf_kmap_atomic,
>> + .unmap = drm_gem_dmabuf_kunmap,
>> + .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>> .mmap = drm_gem_dmabuf_mmap,
>> .vmap = drm_gem_dmabuf_vmap,
>> .vunmap = drm_gem_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> index 11898cd..f225bf6 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> @@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
>> .map_dma_buf = i915_gem_map_dma_buf,
>> .unmap_dma_buf = i915_gem_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap = i915_gem_dmabuf_kmap,
>> - .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
>> - .kunmap = i915_gem_dmabuf_kunmap,
>> - .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>> + .map = i915_gem_dmabuf_kmap,
>> + .map_atomic = i915_gem_dmabuf_kmap_atomic,
>> + .unmap = i915_gem_dmabuf_kunmap,
>> + .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>> .mmap = i915_gem_dmabuf_mmap,
>> .vmap = i915_gem_dmabuf_vmap,
>> .vunmap = i915_gem_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> index 99da8f4..302f7d1 100644
>> --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> @@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = {
>> .map_dma_buf = mock_map_dma_buf,
>> .unmap_dma_buf = mock_unmap_dma_buf,
>> .release = mock_dmabuf_release,
>> - .kmap = mock_dmabuf_kmap,
>> - .kmap_atomic = mock_dmabuf_kmap_atomic,
>> - .kunmap = mock_dmabuf_kunmap,
>> - .kunmap_atomic = mock_dmabuf_kunmap_atomic,
>> + .map = mock_dmabuf_kmap,
>> + .map_atomic = mock_dmabuf_kmap_atomic,
>> + .unmap = mock_dmabuf_kunmap,
>> + .unmap_atomic = mock_dmabuf_kunmap_atomic,
>> .mmap = mock_dmabuf_mmap,
>> .vmap = mock_dmabuf_vmap,
>> .vunmap = mock_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> index ee5883f..0dbe030 100644
>> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> @@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
>> .release = omap_gem_dmabuf_release,
>> .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
>> .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
>> - .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
>> - .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>> - .kmap = omap_gem_dmabuf_kmap,
>> - .kunmap = omap_gem_dmabuf_kunmap,
>> + .map_atomic = omap_gem_dmabuf_kmap_atomic,
>> + .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>> + .map = omap_gem_dmabuf_kmap,
>> + .unmap = omap_gem_dmabuf_kunmap,
>> .mmap = omap_gem_dmabuf_mmap,
>> };
>>
>> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
>> index 17e62ec..8672f5d 100644
>> --- a/drivers/gpu/drm/tegra/gem.c
>> +++ b/drivers/gpu/drm/tegra/gem.c
>> @@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
>> .map_dma_buf = tegra_gem_prime_map_dma_buf,
>> .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
>> .release = tegra_gem_prime_release,
>> - .kmap_atomic = tegra_gem_prime_kmap_atomic,
>> - .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
>> - .kmap = tegra_gem_prime_kmap,
>> - .kunmap = tegra_gem_prime_kunmap,
>> + .map_atomic = tegra_gem_prime_kmap_atomic,
>> + .unmap_atomic = tegra_gem_prime_kunmap_atomic,
>> + .map = tegra_gem_prime_kmap,
>> + .unmap = tegra_gem_prime_kunmap,
>> .mmap = tegra_gem_prime_mmap,
>> .vmap = tegra_gem_prime_vmap,
>> .vunmap = tegra_gem_prime_vunmap,
>> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
>> index ac90ffd..ed0e636 100644
>> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
>> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
>> @@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
>> .detach = udl_detach_dma_buf,
>> .map_dma_buf = udl_map_dma_buf,
>> .unmap_dma_buf = udl_unmap_dma_buf,
>> - .kmap = udl_dmabuf_kmap,
>> - .kmap_atomic = udl_dmabuf_kmap_atomic,
>> - .kunmap = udl_dmabuf_kunmap,
>> - .kunmap_atomic = udl_dmabuf_kunmap_atomic,
>> + .map = udl_dmabuf_kmap,
>> + .map_atomic = udl_dmabuf_kmap_atomic,
>> + .unmap = udl_dmabuf_kunmap,
>> + .unmap_atomic = udl_dmabuf_kunmap_atomic,
>> .mmap = udl_dmabuf_mmap,
>> .release = drm_gem_dmabuf_release,
>> };
>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> index 31fe32d..0d42a46 100644
>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> @@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
>> .map_dma_buf = vmw_prime_map_dma_buf,
>> .unmap_dma_buf = vmw_prime_unmap_dma_buf,
>> .release = NULL,
>> - .kmap = vmw_prime_dmabuf_kmap,
>> - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
>> - .kunmap = vmw_prime_dmabuf_kunmap,
>> - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>> + .map = vmw_prime_dmabuf_kmap,
>> + .map_atomic = vmw_prime_dmabuf_kmap_atomic,
>> + .unmap = vmw_prime_dmabuf_kunmap,
>> + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>> .mmap = vmw_prime_dmabuf_mmap,
>> .vmap = vmw_prime_dmabuf_vmap,
>> .vunmap = vmw_prime_dmabuf_vunmap,
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> index fb6a177..2db0413 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> @@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
>> .detach = vb2_dc_dmabuf_ops_detach,
>> .map_dma_buf = vb2_dc_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
>> - .kmap = vb2_dc_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
>> + .map = vb2_dc_dmabuf_ops_kmap,
>> + .map_atomic = vb2_dc_dmabuf_ops_kmap,
>> .vmap = vb2_dc_dmabuf_ops_vmap,
>> .mmap = vb2_dc_dmabuf_ops_mmap,
>> .release = vb2_dc_dmabuf_ops_release,
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> index ecff8f4..6fd1343 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> @@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
>> .detach = vb2_dma_sg_dmabuf_ops_detach,
>> .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
>> - .kmap = vb2_dma_sg_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>> + .map = vb2_dma_sg_dmabuf_ops_kmap,
>> + .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>> .vmap = vb2_dma_sg_dmabuf_ops_vmap,
>> .mmap = vb2_dma_sg_dmabuf_ops_mmap,
>> .release = vb2_dma_sg_dmabuf_ops_release,
>> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> index 3f77814..27d1db3 100644
>> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> @@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
>> .detach = vb2_vmalloc_dmabuf_ops_detach,
>> .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
>> - .kmap = vb2_vmalloc_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>> + .map = vb2_vmalloc_dmabuf_ops_kmap,
>> + .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>> .vmap = vb2_vmalloc_dmabuf_ops_vmap,
>> .mmap = vb2_vmalloc_dmabuf_ops_mmap,
>> .release = vb2_vmalloc_dmabuf_ops_release,
>> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
>> index f45115f..95a7f16 100644
>> --- a/drivers/staging/android/ion/ion.c
>> +++ b/drivers/staging/android/ion/ion.c
>> @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
>> .release = ion_dma_buf_release,
>> .begin_cpu_access = ion_dma_buf_begin_cpu_access,
>> .end_cpu_access = ion_dma_buf_end_cpu_access,
>> - .kmap_atomic = ion_dma_buf_kmap,
>> - .kunmap_atomic = ion_dma_buf_kunmap,
>> - .kmap = ion_dma_buf_kmap,
>> - .kunmap = ion_dma_buf_kunmap,
>> + .map_atomic = ion_dma_buf_kmap,
>> + .unmap_atomic = ion_dma_buf_kunmap,
>> + .map = ion_dma_buf_kmap,
>> + .unmap = ion_dma_buf_kunmap,
>> };
>>
>> struct dma_buf *ion_share_dma_buf(struct ion_client *client,
>> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
>> index bfb3704..79f27d6 100644
>> --- a/include/linux/dma-buf.h
>> +++ b/include/linux/dma-buf.h
>> @@ -39,13 +39,13 @@ struct dma_buf_attachment;
>>
>> /**
>> * struct dma_buf_ops - operations possible on struct dma_buf
>> - * @kmap_atomic: maps a page from the buffer into kernel address
>> - * space, users may not block until the subsequent unmap call.
>> - * This callback must not sleep.
>> - * @kunmap_atomic: [optional] unmaps a atomically mapped page from the buffer.
>> - * This Callback must not sleep.
>> - * @kmap: maps a page from the buffer into kernel address space.
>> - * @kunmap: [optional] unmaps a page from the buffer.
>> + * @map_atomic: 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.
>> + * @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.
>> * @vunmap: [optional] unmaps a vmap from the buffer
>> @@ -206,10 +206,10 @@ struct dma_buf_ops {
>> * to be restarted.
>> */
>> int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
>> - void *(*kmap_atomic)(struct dma_buf *, unsigned long);
>> - void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
>> - void *(*kmap)(struct dma_buf *, unsigned long);
>> - void (*kunmap)(struct dma_buf *, unsigned long, void *);
>> + void *(*map_atomic)(struct dma_buf *, unsigned long);
>> + void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
>> + void *(*map)(struct dma_buf *, unsigned long);
>> + void (*unmap)(struct dma_buf *, unsigned long, void *);
>>
>> /**
>> * @mmap:
>> --
>> 2.1.4
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Thanks and regards,
Sumit Semwal
Linaro Mobile Group - Kernel Team Lead
Linaro.org │ Open source software for ARM SoCs
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
@ 2017-04-20 8:01 ` Sumit Semwal
0 siblings, 0 replies; 13+ messages in thread
From: Sumit Semwal @ 2017-04-20 8:01 UTC (permalink / raw)
To: Logan Gunthorpe, LKML, Intel Graphics Development, linux-media,
DRI mailing list, linux-tegra, devel, David Airlie,
Thierry Reding, Arve Hjønnevåg, Daniel Vetter,
Sumit Semwal, Marek Szyprowski, Alexandre Courbot,
Thomas Hellstrom, Sinclair Yeh, Russell King, Christoph Hellwig,
Tomi Valkeinen, VMware Graphics, Laura Abbott, Pawel Osciak,
Stephen Warren, Riley Andrews, Mauro Carvalho Chehab,
Greg Kroah-Hartman, Kyungmin Park
Hi Logan,
Thanks for the patch.
On 20 April 2017 at 13:21, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Wed, Apr 19, 2017 at 01:36:10PM -0600, Logan Gunthorpe wrote:
>> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
>> in highmem.h, the former can be aliased if any dma-buf user includes
>> that header.
>>
>> I'm personally trying to include highmem.h inside scatterlist.h and this
>> breaks the dma-buf code proper.
>>
>> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>>
>> To maintain consistency I've renamed all four of kmap* and kunmap* to be
>> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>>
>> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>>
>> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
>> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
>
> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
>
> Probably simplest if we pull this in through the drm-misc tree for 4.12.
> Can we have an ack for the v4l side for that pls?
>
> Thanks, Daniel
>
>> ---
>>
>> Changes since v1:
>>
>> - Added the missing tegra driver (noticed by kbuild robot)
>> - Rebased off of drm-intel-next to get the i915 selftest that is new
>> - Fixed nits Sinclair pointed out.
>>
>> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
>> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
>> drivers/gpu/drm/drm_prime.c | 8 ++++----
>> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/tegra/gem.c | 8 ++++----
>> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
>> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
>> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
>> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
>> drivers/staging/android/ion/ion.c | 8 ++++----
>> include/linux/dma-buf.h | 22 +++++++++++-----------
>> 14 files changed, 61 insertions(+), 61 deletions(-)
>>
>> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
>> index f72aaac..512bdbc 100644
>> --- a/drivers/dma-buf/dma-buf.c
>> +++ b/drivers/dma-buf/dma-buf.c
>> @@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
>> || !exp_info->ops->map_dma_buf
>> || !exp_info->ops->unmap_dma_buf
>> || !exp_info->ops->release
>> - || !exp_info->ops->kmap_atomic
>> - || !exp_info->ops->kmap
>> + || !exp_info->ops->map_atomic
>> + || !exp_info->ops->map
>> || !exp_info->ops->mmap)) {
>> return ERR_PTR(-EINVAL);
>> }
>> @@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num)
>> {
>> WARN_ON(!dmabuf);
>>
>> - return dmabuf->ops->kmap_atomic(dmabuf, page_num);
>> + return dmabuf->ops->map_atomic(dmabuf, page_num);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
>>
>> @@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num,
>> {
>> WARN_ON(!dmabuf);
>>
>> - if (dmabuf->ops->kunmap_atomic)
>> - dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
>> + if (dmabuf->ops->unmap_atomic)
>> + dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
>>
>> @@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
>> {
>> WARN_ON(!dmabuf);
>>
>> - return dmabuf->ops->kmap(dmabuf, page_num);
>> + return dmabuf->ops->map(dmabuf, page_num);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kmap);
>>
>> @@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num,
>> {
>> WARN_ON(!dmabuf);
>>
>> - if (dmabuf->ops->kunmap)
>> - dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
>> + if (dmabuf->ops->unmap)
>> + dmabuf->ops->unmap(dmabuf, page_num, vaddr);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kunmap);
>>
>> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
>> index 1597458..d6c2a5d 100644
>> --- a/drivers/gpu/drm/armada/armada_gem.c
>> +++ b/drivers/gpu/drm/armada/armada_gem.c
>> @@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
>> .map_dma_buf = armada_gem_prime_map_dma_buf,
>> .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap_atomic = armada_gem_dmabuf_no_kmap,
>> - .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
>> - .kmap = armada_gem_dmabuf_no_kmap,
>> - .kunmap = armada_gem_dmabuf_no_kunmap,
>> + .map_atomic = armada_gem_dmabuf_no_kmap,
>> + .unmap_atomic = armada_gem_dmabuf_no_kunmap,
>> + .map = armada_gem_dmabuf_no_kmap,
>> + .unmap = armada_gem_dmabuf_no_kunmap,
>> .mmap = armada_gem_dmabuf_mmap,
>> };
>>
>> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
>> index 9fb65b7..954eb84 100644
>> --- a/drivers/gpu/drm/drm_prime.c
>> +++ b/drivers/gpu/drm/drm_prime.c
>> @@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
>> .map_dma_buf = drm_gem_map_dma_buf,
>> .unmap_dma_buf = drm_gem_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap = drm_gem_dmabuf_kmap,
>> - .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
>> - .kunmap = drm_gem_dmabuf_kunmap,
>> - .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>> + .map = drm_gem_dmabuf_kmap,
>> + .map_atomic = drm_gem_dmabuf_kmap_atomic,
>> + .unmap = drm_gem_dmabuf_kunmap,
>> + .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>> .mmap = drm_gem_dmabuf_mmap,
>> .vmap = drm_gem_dmabuf_vmap,
>> .vunmap = drm_gem_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> index 11898cd..f225bf6 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> @@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
>> .map_dma_buf = i915_gem_map_dma_buf,
>> .unmap_dma_buf = i915_gem_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap = i915_gem_dmabuf_kmap,
>> - .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
>> - .kunmap = i915_gem_dmabuf_kunmap,
>> - .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>> + .map = i915_gem_dmabuf_kmap,
>> + .map_atomic = i915_gem_dmabuf_kmap_atomic,
>> + .unmap = i915_gem_dmabuf_kunmap,
>> + .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>> .mmap = i915_gem_dmabuf_mmap,
>> .vmap = i915_gem_dmabuf_vmap,
>> .vunmap = i915_gem_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> index 99da8f4..302f7d1 100644
>> --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> @@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = {
>> .map_dma_buf = mock_map_dma_buf,
>> .unmap_dma_buf = mock_unmap_dma_buf,
>> .release = mock_dmabuf_release,
>> - .kmap = mock_dmabuf_kmap,
>> - .kmap_atomic = mock_dmabuf_kmap_atomic,
>> - .kunmap = mock_dmabuf_kunmap,
>> - .kunmap_atomic = mock_dmabuf_kunmap_atomic,
>> + .map = mock_dmabuf_kmap,
>> + .map_atomic = mock_dmabuf_kmap_atomic,
>> + .unmap = mock_dmabuf_kunmap,
>> + .unmap_atomic = mock_dmabuf_kunmap_atomic,
>> .mmap = mock_dmabuf_mmap,
>> .vmap = mock_dmabuf_vmap,
>> .vunmap = mock_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> index ee5883f..0dbe030 100644
>> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> @@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
>> .release = omap_gem_dmabuf_release,
>> .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
>> .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
>> - .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
>> - .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>> - .kmap = omap_gem_dmabuf_kmap,
>> - .kunmap = omap_gem_dmabuf_kunmap,
>> + .map_atomic = omap_gem_dmabuf_kmap_atomic,
>> + .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>> + .map = omap_gem_dmabuf_kmap,
>> + .unmap = omap_gem_dmabuf_kunmap,
>> .mmap = omap_gem_dmabuf_mmap,
>> };
>>
>> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
>> index 17e62ec..8672f5d 100644
>> --- a/drivers/gpu/drm/tegra/gem.c
>> +++ b/drivers/gpu/drm/tegra/gem.c
>> @@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
>> .map_dma_buf = tegra_gem_prime_map_dma_buf,
>> .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
>> .release = tegra_gem_prime_release,
>> - .kmap_atomic = tegra_gem_prime_kmap_atomic,
>> - .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
>> - .kmap = tegra_gem_prime_kmap,
>> - .kunmap = tegra_gem_prime_kunmap,
>> + .map_atomic = tegra_gem_prime_kmap_atomic,
>> + .unmap_atomic = tegra_gem_prime_kunmap_atomic,
>> + .map = tegra_gem_prime_kmap,
>> + .unmap = tegra_gem_prime_kunmap,
>> .mmap = tegra_gem_prime_mmap,
>> .vmap = tegra_gem_prime_vmap,
>> .vunmap = tegra_gem_prime_vunmap,
>> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
>> index ac90ffd..ed0e636 100644
>> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
>> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
>> @@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
>> .detach = udl_detach_dma_buf,
>> .map_dma_buf = udl_map_dma_buf,
>> .unmap_dma_buf = udl_unmap_dma_buf,
>> - .kmap = udl_dmabuf_kmap,
>> - .kmap_atomic = udl_dmabuf_kmap_atomic,
>> - .kunmap = udl_dmabuf_kunmap,
>> - .kunmap_atomic = udl_dmabuf_kunmap_atomic,
>> + .map = udl_dmabuf_kmap,
>> + .map_atomic = udl_dmabuf_kmap_atomic,
>> + .unmap = udl_dmabuf_kunmap,
>> + .unmap_atomic = udl_dmabuf_kunmap_atomic,
>> .mmap = udl_dmabuf_mmap,
>> .release = drm_gem_dmabuf_release,
>> };
>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> index 31fe32d..0d42a46 100644
>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> @@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
>> .map_dma_buf = vmw_prime_map_dma_buf,
>> .unmap_dma_buf = vmw_prime_unmap_dma_buf,
>> .release = NULL,
>> - .kmap = vmw_prime_dmabuf_kmap,
>> - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
>> - .kunmap = vmw_prime_dmabuf_kunmap,
>> - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>> + .map = vmw_prime_dmabuf_kmap,
>> + .map_atomic = vmw_prime_dmabuf_kmap_atomic,
>> + .unmap = vmw_prime_dmabuf_kunmap,
>> + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>> .mmap = vmw_prime_dmabuf_mmap,
>> .vmap = vmw_prime_dmabuf_vmap,
>> .vunmap = vmw_prime_dmabuf_vunmap,
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> index fb6a177..2db0413 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> @@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
>> .detach = vb2_dc_dmabuf_ops_detach,
>> .map_dma_buf = vb2_dc_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
>> - .kmap = vb2_dc_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
>> + .map = vb2_dc_dmabuf_ops_kmap,
>> + .map_atomic = vb2_dc_dmabuf_ops_kmap,
>> .vmap = vb2_dc_dmabuf_ops_vmap,
>> .mmap = vb2_dc_dmabuf_ops_mmap,
>> .release = vb2_dc_dmabuf_ops_release,
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> index ecff8f4..6fd1343 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> @@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
>> .detach = vb2_dma_sg_dmabuf_ops_detach,
>> .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
>> - .kmap = vb2_dma_sg_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>> + .map = vb2_dma_sg_dmabuf_ops_kmap,
>> + .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>> .vmap = vb2_dma_sg_dmabuf_ops_vmap,
>> .mmap = vb2_dma_sg_dmabuf_ops_mmap,
>> .release = vb2_dma_sg_dmabuf_ops_release,
>> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> index 3f77814..27d1db3 100644
>> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> @@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
>> .detach = vb2_vmalloc_dmabuf_ops_detach,
>> .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
>> - .kmap = vb2_vmalloc_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>> + .map = vb2_vmalloc_dmabuf_ops_kmap,
>> + .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>> .vmap = vb2_vmalloc_dmabuf_ops_vmap,
>> .mmap = vb2_vmalloc_dmabuf_ops_mmap,
>> .release = vb2_vmalloc_dmabuf_ops_release,
>> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
>> index f45115f..95a7f16 100644
>> --- a/drivers/staging/android/ion/ion.c
>> +++ b/drivers/staging/android/ion/ion.c
>> @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
>> .release = ion_dma_buf_release,
>> .begin_cpu_access = ion_dma_buf_begin_cpu_access,
>> .end_cpu_access = ion_dma_buf_end_cpu_access,
>> - .kmap_atomic = ion_dma_buf_kmap,
>> - .kunmap_atomic = ion_dma_buf_kunmap,
>> - .kmap = ion_dma_buf_kmap,
>> - .kunmap = ion_dma_buf_kunmap,
>> + .map_atomic = ion_dma_buf_kmap,
>> + .unmap_atomic = ion_dma_buf_kunmap,
>> + .map = ion_dma_buf_kmap,
>> + .unmap = ion_dma_buf_kunmap,
>> };
>>
>> struct dma_buf *ion_share_dma_buf(struct ion_client *client,
>> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
>> index bfb3704..79f27d6 100644
>> --- a/include/linux/dma-buf.h
>> +++ b/include/linux/dma-buf.h
>> @@ -39,13 +39,13 @@ struct dma_buf_attachment;
>>
>> /**
>> * struct dma_buf_ops - operations possible on struct dma_buf
>> - * @kmap_atomic: maps a page from the buffer into kernel address
>> - * space, users may not block until the subsequent unmap call.
>> - * This callback must not sleep.
>> - * @kunmap_atomic: [optional] unmaps a atomically mapped page from the buffer.
>> - * This Callback must not sleep.
>> - * @kmap: maps a page from the buffer into kernel address space.
>> - * @kunmap: [optional] unmaps a page from the buffer.
>> + * @map_atomic: 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.
>> + * @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.
>> * @vunmap: [optional] unmaps a vmap from the buffer
>> @@ -206,10 +206,10 @@ struct dma_buf_ops {
>> * to be restarted.
>> */
>> int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
>> - void *(*kmap_atomic)(struct dma_buf *, unsigned long);
>> - void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
>> - void *(*kmap)(struct dma_buf *, unsigned long);
>> - void (*kunmap)(struct dma_buf *, unsigned long, void *);
>> + void *(*map_atomic)(struct dma_buf *, unsigned long);
>> + void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
>> + void *(*map)(struct dma_buf *, unsigned long);
>> + void (*unmap)(struct dma_buf *, unsigned long, void *);
>>
>> /**
>> * @mmap:
>> --
>> 2.1.4
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Thanks and regards,
Sumit Semwal
Linaro Mobile Group - Kernel Team Lead
Linaro.org │ Open source software for ARM SoCs
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
2017-04-20 7:51 ` Daniel Vetter
@ 2017-04-20 8:06 ` Marek Szyprowski
-1 siblings, 0 replies; 13+ messages in thread
From: Marek Szyprowski @ 2017-04-20 8:06 UTC (permalink / raw)
To: Logan Gunthorpe, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-media-u79uwXL29TY76Z2rM5mHXA,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b, David Airlie,
Thierry Reding, Arve Hjønnevåg, Daniel Vetter,
Sumit Semwal, Alexandre Courbot, Thomas Hellstrom, Sinclair Yeh,
Russell King, Christoph Hellwig, Tomi Valkeinen, VMware Graphics,
Laura Abbott
Hi All,
On 2017-04-20 09:51, Daniel Vetter wrote:
> On Wed, Apr 19, 2017 at 01:36:10PM -0600, Logan Gunthorpe wrote:
>> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
>> in highmem.h, the former can be aliased if any dma-buf user includes
>> that header.
>>
>> I'm personally trying to include highmem.h inside scatterlist.h and this
>> breaks the dma-buf code proper.
>>
>> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>>
>> To maintain consistency I've renamed all four of kmap* and kunmap* to be
>> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>>
>> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>>
>> Signed-off-by: Logan Gunthorpe <logang-OTvnGxWRz7hWk0Htik3J/w@public.gmane.org>
>> Reviewed-by: Sinclair Yeh <syeh-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org>
> Acked-by: Daniel Vetter <daniel.vetter-/w4YWyX8dFk@public.gmane.org>
>
> Probably simplest if we pull this in through the drm-misc tree for 4.12.
> Can we have an ack for the v4l side for that pls?
For the V4L2/videobuf2:
Acked-by: Marek Szyprowski <m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> Thanks, Daniel
>> ---
>>
>> Changes since v1:
>>
>> - Added the missing tegra driver (noticed by kbuild robot)
>> - Rebased off of drm-intel-next to get the i915 selftest that is new
>> - Fixed nits Sinclair pointed out.
>>
>> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
>> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
>> drivers/gpu/drm/drm_prime.c | 8 ++++----
>> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/tegra/gem.c | 8 ++++----
>> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
>> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
>> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
>> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
>> drivers/staging/android/ion/ion.c | 8 ++++----
>> include/linux/dma-buf.h | 22 +++++++++++-----------
>> 14 files changed, 61 insertions(+), 61 deletions(-)
>>
>> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
>> index f72aaac..512bdbc 100644
>> --- a/drivers/dma-buf/dma-buf.c
>> +++ b/drivers/dma-buf/dma-buf.c
>> @@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
>> || !exp_info->ops->map_dma_buf
>> || !exp_info->ops->unmap_dma_buf
>> || !exp_info->ops->release
>> - || !exp_info->ops->kmap_atomic
>> - || !exp_info->ops->kmap
>> + || !exp_info->ops->map_atomic
>> + || !exp_info->ops->map
>> || !exp_info->ops->mmap)) {
>> return ERR_PTR(-EINVAL);
>> }
>> @@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num)
>> {
>> WARN_ON(!dmabuf);
>>
>> - return dmabuf->ops->kmap_atomic(dmabuf, page_num);
>> + return dmabuf->ops->map_atomic(dmabuf, page_num);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
>>
>> @@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num,
>> {
>> WARN_ON(!dmabuf);
>>
>> - if (dmabuf->ops->kunmap_atomic)
>> - dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
>> + if (dmabuf->ops->unmap_atomic)
>> + dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
>>
>> @@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
>> {
>> WARN_ON(!dmabuf);
>>
>> - return dmabuf->ops->kmap(dmabuf, page_num);
>> + return dmabuf->ops->map(dmabuf, page_num);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kmap);
>>
>> @@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num,
>> {
>> WARN_ON(!dmabuf);
>>
>> - if (dmabuf->ops->kunmap)
>> - dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
>> + if (dmabuf->ops->unmap)
>> + dmabuf->ops->unmap(dmabuf, page_num, vaddr);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kunmap);
>>
>> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
>> index 1597458..d6c2a5d 100644
>> --- a/drivers/gpu/drm/armada/armada_gem.c
>> +++ b/drivers/gpu/drm/armada/armada_gem.c
>> @@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
>> .map_dma_buf = armada_gem_prime_map_dma_buf,
>> .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap_atomic = armada_gem_dmabuf_no_kmap,
>> - .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
>> - .kmap = armada_gem_dmabuf_no_kmap,
>> - .kunmap = armada_gem_dmabuf_no_kunmap,
>> + .map_atomic = armada_gem_dmabuf_no_kmap,
>> + .unmap_atomic = armada_gem_dmabuf_no_kunmap,
>> + .map = armada_gem_dmabuf_no_kmap,
>> + .unmap = armada_gem_dmabuf_no_kunmap,
>> .mmap = armada_gem_dmabuf_mmap,
>> };
>>
>> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
>> index 9fb65b7..954eb84 100644
>> --- a/drivers/gpu/drm/drm_prime.c
>> +++ b/drivers/gpu/drm/drm_prime.c
>> @@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
>> .map_dma_buf = drm_gem_map_dma_buf,
>> .unmap_dma_buf = drm_gem_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap = drm_gem_dmabuf_kmap,
>> - .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
>> - .kunmap = drm_gem_dmabuf_kunmap,
>> - .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>> + .map = drm_gem_dmabuf_kmap,
>> + .map_atomic = drm_gem_dmabuf_kmap_atomic,
>> + .unmap = drm_gem_dmabuf_kunmap,
>> + .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>> .mmap = drm_gem_dmabuf_mmap,
>> .vmap = drm_gem_dmabuf_vmap,
>> .vunmap = drm_gem_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> index 11898cd..f225bf6 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> @@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
>> .map_dma_buf = i915_gem_map_dma_buf,
>> .unmap_dma_buf = i915_gem_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap = i915_gem_dmabuf_kmap,
>> - .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
>> - .kunmap = i915_gem_dmabuf_kunmap,
>> - .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>> + .map = i915_gem_dmabuf_kmap,
>> + .map_atomic = i915_gem_dmabuf_kmap_atomic,
>> + .unmap = i915_gem_dmabuf_kunmap,
>> + .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>> .mmap = i915_gem_dmabuf_mmap,
>> .vmap = i915_gem_dmabuf_vmap,
>> .vunmap = i915_gem_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> index 99da8f4..302f7d1 100644
>> --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> @@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = {
>> .map_dma_buf = mock_map_dma_buf,
>> .unmap_dma_buf = mock_unmap_dma_buf,
>> .release = mock_dmabuf_release,
>> - .kmap = mock_dmabuf_kmap,
>> - .kmap_atomic = mock_dmabuf_kmap_atomic,
>> - .kunmap = mock_dmabuf_kunmap,
>> - .kunmap_atomic = mock_dmabuf_kunmap_atomic,
>> + .map = mock_dmabuf_kmap,
>> + .map_atomic = mock_dmabuf_kmap_atomic,
>> + .unmap = mock_dmabuf_kunmap,
>> + .unmap_atomic = mock_dmabuf_kunmap_atomic,
>> .mmap = mock_dmabuf_mmap,
>> .vmap = mock_dmabuf_vmap,
>> .vunmap = mock_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> index ee5883f..0dbe030 100644
>> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> @@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
>> .release = omap_gem_dmabuf_release,
>> .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
>> .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
>> - .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
>> - .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>> - .kmap = omap_gem_dmabuf_kmap,
>> - .kunmap = omap_gem_dmabuf_kunmap,
>> + .map_atomic = omap_gem_dmabuf_kmap_atomic,
>> + .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>> + .map = omap_gem_dmabuf_kmap,
>> + .unmap = omap_gem_dmabuf_kunmap,
>> .mmap = omap_gem_dmabuf_mmap,
>> };
>>
>> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
>> index 17e62ec..8672f5d 100644
>> --- a/drivers/gpu/drm/tegra/gem.c
>> +++ b/drivers/gpu/drm/tegra/gem.c
>> @@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
>> .map_dma_buf = tegra_gem_prime_map_dma_buf,
>> .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
>> .release = tegra_gem_prime_release,
>> - .kmap_atomic = tegra_gem_prime_kmap_atomic,
>> - .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
>> - .kmap = tegra_gem_prime_kmap,
>> - .kunmap = tegra_gem_prime_kunmap,
>> + .map_atomic = tegra_gem_prime_kmap_atomic,
>> + .unmap_atomic = tegra_gem_prime_kunmap_atomic,
>> + .map = tegra_gem_prime_kmap,
>> + .unmap = tegra_gem_prime_kunmap,
>> .mmap = tegra_gem_prime_mmap,
>> .vmap = tegra_gem_prime_vmap,
>> .vunmap = tegra_gem_prime_vunmap,
>> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
>> index ac90ffd..ed0e636 100644
>> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
>> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
>> @@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
>> .detach = udl_detach_dma_buf,
>> .map_dma_buf = udl_map_dma_buf,
>> .unmap_dma_buf = udl_unmap_dma_buf,
>> - .kmap = udl_dmabuf_kmap,
>> - .kmap_atomic = udl_dmabuf_kmap_atomic,
>> - .kunmap = udl_dmabuf_kunmap,
>> - .kunmap_atomic = udl_dmabuf_kunmap_atomic,
>> + .map = udl_dmabuf_kmap,
>> + .map_atomic = udl_dmabuf_kmap_atomic,
>> + .unmap = udl_dmabuf_kunmap,
>> + .unmap_atomic = udl_dmabuf_kunmap_atomic,
>> .mmap = udl_dmabuf_mmap,
>> .release = drm_gem_dmabuf_release,
>> };
>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> index 31fe32d..0d42a46 100644
>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> @@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
>> .map_dma_buf = vmw_prime_map_dma_buf,
>> .unmap_dma_buf = vmw_prime_unmap_dma_buf,
>> .release = NULL,
>> - .kmap = vmw_prime_dmabuf_kmap,
>> - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
>> - .kunmap = vmw_prime_dmabuf_kunmap,
>> - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>> + .map = vmw_prime_dmabuf_kmap,
>> + .map_atomic = vmw_prime_dmabuf_kmap_atomic,
>> + .unmap = vmw_prime_dmabuf_kunmap,
>> + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>> .mmap = vmw_prime_dmabuf_mmap,
>> .vmap = vmw_prime_dmabuf_vmap,
>> .vunmap = vmw_prime_dmabuf_vunmap,
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> index fb6a177..2db0413 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> @@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
>> .detach = vb2_dc_dmabuf_ops_detach,
>> .map_dma_buf = vb2_dc_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
>> - .kmap = vb2_dc_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
>> + .map = vb2_dc_dmabuf_ops_kmap,
>> + .map_atomic = vb2_dc_dmabuf_ops_kmap,
>> .vmap = vb2_dc_dmabuf_ops_vmap,
>> .mmap = vb2_dc_dmabuf_ops_mmap,
>> .release = vb2_dc_dmabuf_ops_release,
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> index ecff8f4..6fd1343 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> @@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
>> .detach = vb2_dma_sg_dmabuf_ops_detach,
>> .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
>> - .kmap = vb2_dma_sg_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>> + .map = vb2_dma_sg_dmabuf_ops_kmap,
>> + .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>> .vmap = vb2_dma_sg_dmabuf_ops_vmap,
>> .mmap = vb2_dma_sg_dmabuf_ops_mmap,
>> .release = vb2_dma_sg_dmabuf_ops_release,
>> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> index 3f77814..27d1db3 100644
>> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> @@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
>> .detach = vb2_vmalloc_dmabuf_ops_detach,
>> .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
>> - .kmap = vb2_vmalloc_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>> + .map = vb2_vmalloc_dmabuf_ops_kmap,
>> + .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>> .vmap = vb2_vmalloc_dmabuf_ops_vmap,
>> .mmap = vb2_vmalloc_dmabuf_ops_mmap,
>> .release = vb2_vmalloc_dmabuf_ops_release,
>> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
>> index f45115f..95a7f16 100644
>> --- a/drivers/staging/android/ion/ion.c
>> +++ b/drivers/staging/android/ion/ion.c
>> @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
>> .release = ion_dma_buf_release,
>> .begin_cpu_access = ion_dma_buf_begin_cpu_access,
>> .end_cpu_access = ion_dma_buf_end_cpu_access,
>> - .kmap_atomic = ion_dma_buf_kmap,
>> - .kunmap_atomic = ion_dma_buf_kunmap,
>> - .kmap = ion_dma_buf_kmap,
>> - .kunmap = ion_dma_buf_kunmap,
>> + .map_atomic = ion_dma_buf_kmap,
>> + .unmap_atomic = ion_dma_buf_kunmap,
>> + .map = ion_dma_buf_kmap,
>> + .unmap = ion_dma_buf_kunmap,
>> };
>>
>> struct dma_buf *ion_share_dma_buf(struct ion_client *client,
>> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
>> index bfb3704..79f27d6 100644
>> --- a/include/linux/dma-buf.h
>> +++ b/include/linux/dma-buf.h
>> @@ -39,13 +39,13 @@ struct dma_buf_attachment;
>>
>> /**
>> * struct dma_buf_ops - operations possible on struct dma_buf
>> - * @kmap_atomic: maps a page from the buffer into kernel address
>> - * space, users may not block until the subsequent unmap call.
>> - * This callback must not sleep.
>> - * @kunmap_atomic: [optional] unmaps a atomically mapped page from the buffer.
>> - * This Callback must not sleep.
>> - * @kmap: maps a page from the buffer into kernel address space.
>> - * @kunmap: [optional] unmaps a page from the buffer.
>> + * @map_atomic: 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.
>> + * @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.
>> * @vunmap: [optional] unmaps a vmap from the buffer
>> @@ -206,10 +206,10 @@ struct dma_buf_ops {
>> * to be restarted.
>> */
>> int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
>> - void *(*kmap_atomic)(struct dma_buf *, unsigned long);
>> - void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
>> - void *(*kmap)(struct dma_buf *, unsigned long);
>> - void (*kunmap)(struct dma_buf *, unsigned long, void *);
>> + void *(*map_atomic)(struct dma_buf *, unsigned long);
>> + void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
>> + void *(*map)(struct dma_buf *, unsigned long);
>> + void (*unmap)(struct dma_buf *, unsigned long, void *);
>>
>> /**
>> * @mmap:
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
@ 2017-04-20 8:06 ` Marek Szyprowski
0 siblings, 0 replies; 13+ messages in thread
From: Marek Szyprowski @ 2017-04-20 8:06 UTC (permalink / raw)
To: Logan Gunthorpe, linux-kernel, intel-gfx, linux-media, dri-devel,
linux-tegra, devel, David Airlie, Thierry Reding,
Arve Hjønnevåg, Daniel Vetter, Sumit Semwal,
Alexandre Courbot, Thomas Hellstrom, Sinclair Yeh, Russell King,
Christoph Hellwig, Tomi Valkeinen, VMware Graphics, Laura Abbott,
Pawel Osciak, Stephen Warren, Riley Andrews,
Mauro Carvalho Chehab, Greg Kroah-Hartman, Kyungmin Park
Hi All,
On 2017-04-20 09:51, Daniel Vetter wrote:
> On Wed, Apr 19, 2017 at 01:36:10PM -0600, Logan Gunthorpe wrote:
>> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
>> in highmem.h, the former can be aliased if any dma-buf user includes
>> that header.
>>
>> I'm personally trying to include highmem.h inside scatterlist.h and this
>> breaks the dma-buf code proper.
>>
>> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>>
>> To maintain consistency I've renamed all four of kmap* and kunmap* to be
>> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>>
>> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>>
>> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
>> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Probably simplest if we pull this in through the drm-misc tree for 4.12.
> Can we have an ack for the v4l side for that pls?
For the V4L2/videobuf2:
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
> Thanks, Daniel
>> ---
>>
>> Changes since v1:
>>
>> - Added the missing tegra driver (noticed by kbuild robot)
>> - Rebased off of drm-intel-next to get the i915 selftest that is new
>> - Fixed nits Sinclair pointed out.
>>
>> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
>> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
>> drivers/gpu/drm/drm_prime.c | 8 ++++----
>> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/tegra/gem.c | 8 ++++----
>> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
>> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
>> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
>> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
>> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
>> drivers/staging/android/ion/ion.c | 8 ++++----
>> include/linux/dma-buf.h | 22 +++++++++++-----------
>> 14 files changed, 61 insertions(+), 61 deletions(-)
>>
>> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
>> index f72aaac..512bdbc 100644
>> --- a/drivers/dma-buf/dma-buf.c
>> +++ b/drivers/dma-buf/dma-buf.c
>> @@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
>> || !exp_info->ops->map_dma_buf
>> || !exp_info->ops->unmap_dma_buf
>> || !exp_info->ops->release
>> - || !exp_info->ops->kmap_atomic
>> - || !exp_info->ops->kmap
>> + || !exp_info->ops->map_atomic
>> + || !exp_info->ops->map
>> || !exp_info->ops->mmap)) {
>> return ERR_PTR(-EINVAL);
>> }
>> @@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf, unsigned long page_num)
>> {
>> WARN_ON(!dmabuf);
>>
>> - return dmabuf->ops->kmap_atomic(dmabuf, page_num);
>> + return dmabuf->ops->map_atomic(dmabuf, page_num);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
>>
>> @@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf, unsigned long page_num,
>> {
>> WARN_ON(!dmabuf);
>>
>> - if (dmabuf->ops->kunmap_atomic)
>> - dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
>> + if (dmabuf->ops->unmap_atomic)
>> + dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
>>
>> @@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
>> {
>> WARN_ON(!dmabuf);
>>
>> - return dmabuf->ops->kmap(dmabuf, page_num);
>> + return dmabuf->ops->map(dmabuf, page_num);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kmap);
>>
>> @@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long page_num,
>> {
>> WARN_ON(!dmabuf);
>>
>> - if (dmabuf->ops->kunmap)
>> - dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
>> + if (dmabuf->ops->unmap)
>> + dmabuf->ops->unmap(dmabuf, page_num, vaddr);
>> }
>> EXPORT_SYMBOL_GPL(dma_buf_kunmap);
>>
>> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
>> index 1597458..d6c2a5d 100644
>> --- a/drivers/gpu/drm/armada/armada_gem.c
>> +++ b/drivers/gpu/drm/armada/armada_gem.c
>> @@ -529,10 +529,10 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = {
>> .map_dma_buf = armada_gem_prime_map_dma_buf,
>> .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap_atomic = armada_gem_dmabuf_no_kmap,
>> - .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
>> - .kmap = armada_gem_dmabuf_no_kmap,
>> - .kunmap = armada_gem_dmabuf_no_kunmap,
>> + .map_atomic = armada_gem_dmabuf_no_kmap,
>> + .unmap_atomic = armada_gem_dmabuf_no_kunmap,
>> + .map = armada_gem_dmabuf_no_kmap,
>> + .unmap = armada_gem_dmabuf_no_kunmap,
>> .mmap = armada_gem_dmabuf_mmap,
>> };
>>
>> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
>> index 9fb65b7..954eb84 100644
>> --- a/drivers/gpu/drm/drm_prime.c
>> +++ b/drivers/gpu/drm/drm_prime.c
>> @@ -403,10 +403,10 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
>> .map_dma_buf = drm_gem_map_dma_buf,
>> .unmap_dma_buf = drm_gem_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap = drm_gem_dmabuf_kmap,
>> - .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
>> - .kunmap = drm_gem_dmabuf_kunmap,
>> - .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>> + .map = drm_gem_dmabuf_kmap,
>> + .map_atomic = drm_gem_dmabuf_kmap_atomic,
>> + .unmap = drm_gem_dmabuf_kunmap,
>> + .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>> .mmap = drm_gem_dmabuf_mmap,
>> .vmap = drm_gem_dmabuf_vmap,
>> .vunmap = drm_gem_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> index 11898cd..f225bf6 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>> @@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops = {
>> .map_dma_buf = i915_gem_map_dma_buf,
>> .unmap_dma_buf = i915_gem_unmap_dma_buf,
>> .release = drm_gem_dmabuf_release,
>> - .kmap = i915_gem_dmabuf_kmap,
>> - .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
>> - .kunmap = i915_gem_dmabuf_kunmap,
>> - .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>> + .map = i915_gem_dmabuf_kmap,
>> + .map_atomic = i915_gem_dmabuf_kmap_atomic,
>> + .unmap = i915_gem_dmabuf_kunmap,
>> + .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>> .mmap = i915_gem_dmabuf_mmap,
>> .vmap = i915_gem_dmabuf_vmap,
>> .vunmap = i915_gem_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> index 99da8f4..302f7d1 100644
>> --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>> @@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops = {
>> .map_dma_buf = mock_map_dma_buf,
>> .unmap_dma_buf = mock_unmap_dma_buf,
>> .release = mock_dmabuf_release,
>> - .kmap = mock_dmabuf_kmap,
>> - .kmap_atomic = mock_dmabuf_kmap_atomic,
>> - .kunmap = mock_dmabuf_kunmap,
>> - .kunmap_atomic = mock_dmabuf_kunmap_atomic,
>> + .map = mock_dmabuf_kmap,
>> + .map_atomic = mock_dmabuf_kmap_atomic,
>> + .unmap = mock_dmabuf_kunmap,
>> + .unmap_atomic = mock_dmabuf_kunmap_atomic,
>> .mmap = mock_dmabuf_mmap,
>> .vmap = mock_dmabuf_vmap,
>> .vunmap = mock_dmabuf_vunmap,
>> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> index ee5883f..0dbe030 100644
>> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>> @@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
>> .release = omap_gem_dmabuf_release,
>> .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
>> .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
>> - .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
>> - .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>> - .kmap = omap_gem_dmabuf_kmap,
>> - .kunmap = omap_gem_dmabuf_kunmap,
>> + .map_atomic = omap_gem_dmabuf_kmap_atomic,
>> + .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>> + .map = omap_gem_dmabuf_kmap,
>> + .unmap = omap_gem_dmabuf_kunmap,
>> .mmap = omap_gem_dmabuf_mmap,
>> };
>>
>> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
>> index 17e62ec..8672f5d 100644
>> --- a/drivers/gpu/drm/tegra/gem.c
>> +++ b/drivers/gpu/drm/tegra/gem.c
>> @@ -619,10 +619,10 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = {
>> .map_dma_buf = tegra_gem_prime_map_dma_buf,
>> .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
>> .release = tegra_gem_prime_release,
>> - .kmap_atomic = tegra_gem_prime_kmap_atomic,
>> - .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
>> - .kmap = tegra_gem_prime_kmap,
>> - .kunmap = tegra_gem_prime_kunmap,
>> + .map_atomic = tegra_gem_prime_kmap_atomic,
>> + .unmap_atomic = tegra_gem_prime_kunmap_atomic,
>> + .map = tegra_gem_prime_kmap,
>> + .unmap = tegra_gem_prime_kunmap,
>> .mmap = tegra_gem_prime_mmap,
>> .vmap = tegra_gem_prime_vmap,
>> .vunmap = tegra_gem_prime_vunmap,
>> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c
>> index ac90ffd..ed0e636 100644
>> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
>> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
>> @@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
>> .detach = udl_detach_dma_buf,
>> .map_dma_buf = udl_map_dma_buf,
>> .unmap_dma_buf = udl_unmap_dma_buf,
>> - .kmap = udl_dmabuf_kmap,
>> - .kmap_atomic = udl_dmabuf_kmap_atomic,
>> - .kunmap = udl_dmabuf_kunmap,
>> - .kunmap_atomic = udl_dmabuf_kunmap_atomic,
>> + .map = udl_dmabuf_kmap,
>> + .map_atomic = udl_dmabuf_kmap_atomic,
>> + .unmap = udl_dmabuf_kunmap,
>> + .unmap_atomic = udl_dmabuf_kunmap_atomic,
>> .mmap = udl_dmabuf_mmap,
>> .release = drm_gem_dmabuf_release,
>> };
>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> index 31fe32d..0d42a46 100644
>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>> @@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
>> .map_dma_buf = vmw_prime_map_dma_buf,
>> .unmap_dma_buf = vmw_prime_unmap_dma_buf,
>> .release = NULL,
>> - .kmap = vmw_prime_dmabuf_kmap,
>> - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
>> - .kunmap = vmw_prime_dmabuf_kunmap,
>> - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>> + .map = vmw_prime_dmabuf_kmap,
>> + .map_atomic = vmw_prime_dmabuf_kmap_atomic,
>> + .unmap = vmw_prime_dmabuf_kunmap,
>> + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>> .mmap = vmw_prime_dmabuf_mmap,
>> .vmap = vmw_prime_dmabuf_vmap,
>> .vunmap = vmw_prime_dmabuf_vunmap,
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> index fb6a177..2db0413 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> @@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
>> .detach = vb2_dc_dmabuf_ops_detach,
>> .map_dma_buf = vb2_dc_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
>> - .kmap = vb2_dc_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
>> + .map = vb2_dc_dmabuf_ops_kmap,
>> + .map_atomic = vb2_dc_dmabuf_ops_kmap,
>> .vmap = vb2_dc_dmabuf_ops_vmap,
>> .mmap = vb2_dc_dmabuf_ops_mmap,
>> .release = vb2_dc_dmabuf_ops_release,
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> index ecff8f4..6fd1343 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>> @@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
>> .detach = vb2_dma_sg_dmabuf_ops_detach,
>> .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
>> - .kmap = vb2_dma_sg_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>> + .map = vb2_dma_sg_dmabuf_ops_kmap,
>> + .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>> .vmap = vb2_dma_sg_dmabuf_ops_vmap,
>> .mmap = vb2_dma_sg_dmabuf_ops_mmap,
>> .release = vb2_dma_sg_dmabuf_ops_release,
>> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> index 3f77814..27d1db3 100644
>> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>> @@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
>> .detach = vb2_vmalloc_dmabuf_ops_detach,
>> .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
>> .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
>> - .kmap = vb2_vmalloc_dmabuf_ops_kmap,
>> - .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>> + .map = vb2_vmalloc_dmabuf_ops_kmap,
>> + .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>> .vmap = vb2_vmalloc_dmabuf_ops_vmap,
>> .mmap = vb2_vmalloc_dmabuf_ops_mmap,
>> .release = vb2_vmalloc_dmabuf_ops_release,
>> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
>> index f45115f..95a7f16 100644
>> --- a/drivers/staging/android/ion/ion.c
>> +++ b/drivers/staging/android/ion/ion.c
>> @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
>> .release = ion_dma_buf_release,
>> .begin_cpu_access = ion_dma_buf_begin_cpu_access,
>> .end_cpu_access = ion_dma_buf_end_cpu_access,
>> - .kmap_atomic = ion_dma_buf_kmap,
>> - .kunmap_atomic = ion_dma_buf_kunmap,
>> - .kmap = ion_dma_buf_kmap,
>> - .kunmap = ion_dma_buf_kunmap,
>> + .map_atomic = ion_dma_buf_kmap,
>> + .unmap_atomic = ion_dma_buf_kunmap,
>> + .map = ion_dma_buf_kmap,
>> + .unmap = ion_dma_buf_kunmap,
>> };
>>
>> struct dma_buf *ion_share_dma_buf(struct ion_client *client,
>> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
>> index bfb3704..79f27d6 100644
>> --- a/include/linux/dma-buf.h
>> +++ b/include/linux/dma-buf.h
>> @@ -39,13 +39,13 @@ struct dma_buf_attachment;
>>
>> /**
>> * struct dma_buf_ops - operations possible on struct dma_buf
>> - * @kmap_atomic: maps a page from the buffer into kernel address
>> - * space, users may not block until the subsequent unmap call.
>> - * This callback must not sleep.
>> - * @kunmap_atomic: [optional] unmaps a atomically mapped page from the buffer.
>> - * This Callback must not sleep.
>> - * @kmap: maps a page from the buffer into kernel address space.
>> - * @kunmap: [optional] unmaps a page from the buffer.
>> + * @map_atomic: 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.
>> + * @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.
>> * @vunmap: [optional] unmaps a vmap from the buffer
>> @@ -206,10 +206,10 @@ struct dma_buf_ops {
>> * to be restarted.
>> */
>> int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
>> - void *(*kmap_atomic)(struct dma_buf *, unsigned long);
>> - void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
>> - void *(*kmap)(struct dma_buf *, unsigned long);
>> - void (*kunmap)(struct dma_buf *, unsigned long, void *);
>> + void *(*map_atomic)(struct dma_buf *, unsigned long);
>> + void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
>> + void *(*map)(struct dma_buf *, unsigned long);
>> + void (*unmap)(struct dma_buf *, unsigned long, void *);
>>
>> /**
>> * @mmap:
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
2017-04-20 8:06 ` Marek Szyprowski
@ 2017-04-20 8:09 ` Sumit Semwal
-1 siblings, 0 replies; 13+ messages in thread
From: Sumit Semwal @ 2017-04-20 8:09 UTC (permalink / raw)
To: Marek Szyprowski
Cc: DRI mailing list, Daniel Vetter, Christoph Hellwig, devel,
Alexandre Courbot, Thomas Hellstrom, Russell King,
Tomi Valkeinen, VMware Graphics, Kyungmin Park, linux-media,
Pawel Osciak, Stephen Warren, Intel Graphics Development,
Riley Andrews, linux-tegra, Mauro Carvalho Chehab,
Greg Kroah-Hartman, LKML, Arve Hjønnevåg
Hi Marek,
Thanks!
On 20 April 2017 at 13:36, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
> Hi All,
>
> On 2017-04-20 09:51, Daniel Vetter wrote:
>>
>> On Wed, Apr 19, 2017 at 01:36:10PM -0600, Logan Gunthorpe wrote:
>>>
>>> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
>>> in highmem.h, the former can be aliased if any dma-buf user includes
>>> that header.
>>>
>>> I'm personally trying to include highmem.h inside scatterlist.h and this
>>> breaks the dma-buf code proper.
>>>
>>> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>>>
>>> To maintain consistency I've renamed all four of kmap* and kunmap* to be
>>> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>>>
>>> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>>>
>>> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
>>> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
>>
>> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>>
>> Probably simplest if we pull this in through the drm-misc tree for 4.12.
>> Can we have an ack for the v4l side for that pls?
>
>
> For the V4L2/videobuf2:
> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
>
I will queue it up for drm-misc-fixes so it gets into 4.12.
>
>
>> Thanks, Daniel
Best,
Sumit.
>>>
>>> ---
>>>
>>> Changes since v1:
>>>
>>> - Added the missing tegra driver (noticed by kbuild robot)
>>> - Rebased off of drm-intel-next to get the i915 selftest that is new
>>> - Fixed nits Sinclair pointed out.
>>>
>>> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
>>> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
>>> drivers/gpu/drm/drm_prime.c | 8 ++++----
>>> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
>>> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
>>> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
>>> drivers/gpu/drm/tegra/gem.c | 8 ++++----
>>> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
>>> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
>>> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
>>> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
>>> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
>>> drivers/staging/android/ion/ion.c | 8 ++++----
>>> include/linux/dma-buf.h | 22
>>> +++++++++++-----------
>>> 14 files changed, 61 insertions(+), 61 deletions(-)
>>>
>>> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
>>> index f72aaac..512bdbc 100644
>>> --- a/drivers/dma-buf/dma-buf.c
>>> +++ b/drivers/dma-buf/dma-buf.c
>>> @@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct
>>> dma_buf_export_info *exp_info)
>>> || !exp_info->ops->map_dma_buf
>>> || !exp_info->ops->unmap_dma_buf
>>> || !exp_info->ops->release
>>> - || !exp_info->ops->kmap_atomic
>>> - || !exp_info->ops->kmap
>>> + || !exp_info->ops->map_atomic
>>> + || !exp_info->ops->map
>>> || !exp_info->ops->mmap)) {
>>> return ERR_PTR(-EINVAL);
>>> }
>>> @@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf,
>>> unsigned long page_num)
>>> {
>>> WARN_ON(!dmabuf);
>>>
>>> - return dmabuf->ops->kmap_atomic(dmabuf, page_num);
>>> + return dmabuf->ops->map_atomic(dmabuf, page_num);
>>> }
>>> EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
>>>
>>> @@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf,
>>> unsigned long page_num,
>>> {
>>> WARN_ON(!dmabuf);
>>>
>>> - if (dmabuf->ops->kunmap_atomic)
>>> - dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
>>> + if (dmabuf->ops->unmap_atomic)
>>> + dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
>>> }
>>> EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
>>>
>>> @@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned
>>> long page_num)
>>> {
>>> WARN_ON(!dmabuf);
>>>
>>> - return dmabuf->ops->kmap(dmabuf, page_num);
>>> + return dmabuf->ops->map(dmabuf, page_num);
>>> }
>>> EXPORT_SYMBOL_GPL(dma_buf_kmap);
>>>
>>> @@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned
>>> long page_num,
>>> {
>>> WARN_ON(!dmabuf);
>>>
>>> - if (dmabuf->ops->kunmap)
>>> - dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
>>> + if (dmabuf->ops->unmap)
>>> + dmabuf->ops->unmap(dmabuf, page_num, vaddr);
>>> }
>>> EXPORT_SYMBOL_GPL(dma_buf_kunmap);
>>>
>>> diff --git a/drivers/gpu/drm/armada/armada_gem.c
>>> b/drivers/gpu/drm/armada/armada_gem.c
>>> index 1597458..d6c2a5d 100644
>>> --- a/drivers/gpu/drm/armada/armada_gem.c
>>> +++ b/drivers/gpu/drm/armada/armada_gem.c
>>> @@ -529,10 +529,10 @@ static const struct dma_buf_ops
>>> armada_gem_prime_dmabuf_ops = {
>>> .map_dma_buf = armada_gem_prime_map_dma_buf,
>>> .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
>>> .release = drm_gem_dmabuf_release,
>>> - .kmap_atomic = armada_gem_dmabuf_no_kmap,
>>> - .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
>>> - .kmap = armada_gem_dmabuf_no_kmap,
>>> - .kunmap = armada_gem_dmabuf_no_kunmap,
>>> + .map_atomic = armada_gem_dmabuf_no_kmap,
>>> + .unmap_atomic = armada_gem_dmabuf_no_kunmap,
>>> + .map = armada_gem_dmabuf_no_kmap,
>>> + .unmap = armada_gem_dmabuf_no_kunmap,
>>> .mmap = armada_gem_dmabuf_mmap,
>>> };
>>>
>>> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
>>> index 9fb65b7..954eb84 100644
>>> --- a/drivers/gpu/drm/drm_prime.c
>>> +++ b/drivers/gpu/drm/drm_prime.c
>>> @@ -403,10 +403,10 @@ static const struct dma_buf_ops
>>> drm_gem_prime_dmabuf_ops = {
>>> .map_dma_buf = drm_gem_map_dma_buf,
>>> .unmap_dma_buf = drm_gem_unmap_dma_buf,
>>> .release = drm_gem_dmabuf_release,
>>> - .kmap = drm_gem_dmabuf_kmap,
>>> - .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
>>> - .kunmap = drm_gem_dmabuf_kunmap,
>>> - .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>>> + .map = drm_gem_dmabuf_kmap,
>>> + .map_atomic = drm_gem_dmabuf_kmap_atomic,
>>> + .unmap = drm_gem_dmabuf_kunmap,
>>> + .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>>> .mmap = drm_gem_dmabuf_mmap,
>>> .vmap = drm_gem_dmabuf_vmap,
>>> .vunmap = drm_gem_dmabuf_vunmap,
>>> diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>>> b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>>> index 11898cd..f225bf6 100644
>>> --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>>> +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>>> @@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops =
>>> {
>>> .map_dma_buf = i915_gem_map_dma_buf,
>>> .unmap_dma_buf = i915_gem_unmap_dma_buf,
>>> .release = drm_gem_dmabuf_release,
>>> - .kmap = i915_gem_dmabuf_kmap,
>>> - .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
>>> - .kunmap = i915_gem_dmabuf_kunmap,
>>> - .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>>> + .map = i915_gem_dmabuf_kmap,
>>> + .map_atomic = i915_gem_dmabuf_kmap_atomic,
>>> + .unmap = i915_gem_dmabuf_kunmap,
>>> + .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>>> .mmap = i915_gem_dmabuf_mmap,
>>> .vmap = i915_gem_dmabuf_vmap,
>>> .vunmap = i915_gem_dmabuf_vunmap,
>>> diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>>> b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>>> index 99da8f4..302f7d1 100644
>>> --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>>> +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>>> @@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops =
>>> {
>>> .map_dma_buf = mock_map_dma_buf,
>>> .unmap_dma_buf = mock_unmap_dma_buf,
>>> .release = mock_dmabuf_release,
>>> - .kmap = mock_dmabuf_kmap,
>>> - .kmap_atomic = mock_dmabuf_kmap_atomic,
>>> - .kunmap = mock_dmabuf_kunmap,
>>> - .kunmap_atomic = mock_dmabuf_kunmap_atomic,
>>> + .map = mock_dmabuf_kmap,
>>> + .map_atomic = mock_dmabuf_kmap_atomic,
>>> + .unmap = mock_dmabuf_kunmap,
>>> + .unmap_atomic = mock_dmabuf_kunmap_atomic,
>>> .mmap = mock_dmabuf_mmap,
>>> .vmap = mock_dmabuf_vmap,
>>> .vunmap = mock_dmabuf_vunmap,
>>> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>>> b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>>> index ee5883f..0dbe030 100644
>>> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>>> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>>> @@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
>>> .release = omap_gem_dmabuf_release,
>>> .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
>>> .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
>>> - .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
>>> - .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>>> - .kmap = omap_gem_dmabuf_kmap,
>>> - .kunmap = omap_gem_dmabuf_kunmap,
>>> + .map_atomic = omap_gem_dmabuf_kmap_atomic,
>>> + .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>>> + .map = omap_gem_dmabuf_kmap,
>>> + .unmap = omap_gem_dmabuf_kunmap,
>>> .mmap = omap_gem_dmabuf_mmap,
>>> };
>>>
>>> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
>>> index 17e62ec..8672f5d 100644
>>> --- a/drivers/gpu/drm/tegra/gem.c
>>> +++ b/drivers/gpu/drm/tegra/gem.c
>>> @@ -619,10 +619,10 @@ static const struct dma_buf_ops
>>> tegra_gem_prime_dmabuf_ops = {
>>> .map_dma_buf = tegra_gem_prime_map_dma_buf,
>>> .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
>>> .release = tegra_gem_prime_release,
>>> - .kmap_atomic = tegra_gem_prime_kmap_atomic,
>>> - .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
>>> - .kmap = tegra_gem_prime_kmap,
>>> - .kunmap = tegra_gem_prime_kunmap,
>>> + .map_atomic = tegra_gem_prime_kmap_atomic,
>>> + .unmap_atomic = tegra_gem_prime_kunmap_atomic,
>>> + .map = tegra_gem_prime_kmap,
>>> + .unmap = tegra_gem_prime_kunmap,
>>> .mmap = tegra_gem_prime_mmap,
>>> .vmap = tegra_gem_prime_vmap,
>>> .vunmap = tegra_gem_prime_vunmap,
>>> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c
>>> b/drivers/gpu/drm/udl/udl_dmabuf.c
>>> index ac90ffd..ed0e636 100644
>>> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
>>> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
>>> @@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
>>> .detach = udl_detach_dma_buf,
>>> .map_dma_buf = udl_map_dma_buf,
>>> .unmap_dma_buf = udl_unmap_dma_buf,
>>> - .kmap = udl_dmabuf_kmap,
>>> - .kmap_atomic = udl_dmabuf_kmap_atomic,
>>> - .kunmap = udl_dmabuf_kunmap,
>>> - .kunmap_atomic = udl_dmabuf_kunmap_atomic,
>>> + .map = udl_dmabuf_kmap,
>>> + .map_atomic = udl_dmabuf_kmap_atomic,
>>> + .unmap = udl_dmabuf_kunmap,
>>> + .unmap_atomic = udl_dmabuf_kunmap_atomic,
>>> .mmap = udl_dmabuf_mmap,
>>> .release = drm_gem_dmabuf_release,
>>> };
>>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>>> b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>>> index 31fe32d..0d42a46 100644
>>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>>> @@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
>>> .map_dma_buf = vmw_prime_map_dma_buf,
>>> .unmap_dma_buf = vmw_prime_unmap_dma_buf,
>>> .release = NULL,
>>> - .kmap = vmw_prime_dmabuf_kmap,
>>> - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
>>> - .kunmap = vmw_prime_dmabuf_kunmap,
>>> - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>>> + .map = vmw_prime_dmabuf_kmap,
>>> + .map_atomic = vmw_prime_dmabuf_kmap_atomic,
>>> + .unmap = vmw_prime_dmabuf_kunmap,
>>> + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>>> .mmap = vmw_prime_dmabuf_mmap,
>>> .vmap = vmw_prime_dmabuf_vmap,
>>> .vunmap = vmw_prime_dmabuf_vunmap,
>>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>>> b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>>> index fb6a177..2db0413 100644
>>> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>>> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>>> @@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
>>> .detach = vb2_dc_dmabuf_ops_detach,
>>> .map_dma_buf = vb2_dc_dmabuf_ops_map,
>>> .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
>>> - .kmap = vb2_dc_dmabuf_ops_kmap,
>>> - .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
>>> + .map = vb2_dc_dmabuf_ops_kmap,
>>> + .map_atomic = vb2_dc_dmabuf_ops_kmap,
>>> .vmap = vb2_dc_dmabuf_ops_vmap,
>>> .mmap = vb2_dc_dmabuf_ops_mmap,
>>> .release = vb2_dc_dmabuf_ops_release,
>>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>>> b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>>> index ecff8f4..6fd1343 100644
>>> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>>> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>>> @@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
>>> .detach = vb2_dma_sg_dmabuf_ops_detach,
>>> .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
>>> .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
>>> - .kmap = vb2_dma_sg_dmabuf_ops_kmap,
>>> - .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>>> + .map = vb2_dma_sg_dmabuf_ops_kmap,
>>> + .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>>> .vmap = vb2_dma_sg_dmabuf_ops_vmap,
>>> .mmap = vb2_dma_sg_dmabuf_ops_mmap,
>>> .release = vb2_dma_sg_dmabuf_ops_release,
>>> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c
>>> b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>>> index 3f77814..27d1db3 100644
>>> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
>>> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>>> @@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
>>> .detach = vb2_vmalloc_dmabuf_ops_detach,
>>> .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
>>> .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
>>> - .kmap = vb2_vmalloc_dmabuf_ops_kmap,
>>> - .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>>> + .map = vb2_vmalloc_dmabuf_ops_kmap,
>>> + .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>>> .vmap = vb2_vmalloc_dmabuf_ops_vmap,
>>> .mmap = vb2_vmalloc_dmabuf_ops_mmap,
>>> .release = vb2_vmalloc_dmabuf_ops_release,
>>> diff --git a/drivers/staging/android/ion/ion.c
>>> b/drivers/staging/android/ion/ion.c
>>> index f45115f..95a7f16 100644
>>> --- a/drivers/staging/android/ion/ion.c
>>> +++ b/drivers/staging/android/ion/ion.c
>>> @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
>>> .release = ion_dma_buf_release,
>>> .begin_cpu_access = ion_dma_buf_begin_cpu_access,
>>> .end_cpu_access = ion_dma_buf_end_cpu_access,
>>> - .kmap_atomic = ion_dma_buf_kmap,
>>> - .kunmap_atomic = ion_dma_buf_kunmap,
>>> - .kmap = ion_dma_buf_kmap,
>>> - .kunmap = ion_dma_buf_kunmap,
>>> + .map_atomic = ion_dma_buf_kmap,
>>> + .unmap_atomic = ion_dma_buf_kunmap,
>>> + .map = ion_dma_buf_kmap,
>>> + .unmap = ion_dma_buf_kunmap,
>>> };
>>>
>>> struct dma_buf *ion_share_dma_buf(struct ion_client *client,
>>> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
>>> index bfb3704..79f27d6 100644
>>> --- a/include/linux/dma-buf.h
>>> +++ b/include/linux/dma-buf.h
>>> @@ -39,13 +39,13 @@ struct dma_buf_attachment;
>>>
>>> /**
>>> * struct dma_buf_ops - operations possible on struct dma_buf
>>> - * @kmap_atomic: maps a page from the buffer into kernel address
>>> - * space, users may not block until the subsequent unmap
>>> call.
>>> - * This callback must not sleep.
>>> - * @kunmap_atomic: [optional] unmaps a atomically mapped page from the
>>> buffer.
>>> - * This Callback must not sleep.
>>> - * @kmap: maps a page from the buffer into kernel address space.
>>> - * @kunmap: [optional] unmaps a page from the buffer.
>>> + * @map_atomic: 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.
>>> + * @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.
>>> * @vunmap: [optional] unmaps a vmap from the buffer
>>> @@ -206,10 +206,10 @@ struct dma_buf_ops {
>>> * to be restarted.
>>> */
>>> int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
>>> - void *(*kmap_atomic)(struct dma_buf *, unsigned long);
>>> - void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
>>> - void *(*kmap)(struct dma_buf *, unsigned long);
>>> - void (*kunmap)(struct dma_buf *, unsigned long, void *);
>>> + void *(*map_atomic)(struct dma_buf *, unsigned long);
>>> + void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
>>> + void *(*map)(struct dma_buf *, unsigned long);
>>> + void (*unmap)(struct dma_buf *, unsigned long, void *);
>>>
>>> /**
>>> * @mmap:
>
>
> Best regards
> --
> Marek Szyprowski, PhD
> Samsung R&D Institute Poland
>
--
Thanks and regards,
Sumit Semwal
Linaro Mobile Group - Kernel Team Lead
Linaro.org │ Open source software for ARM SoCs
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Intel-gfx] [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
@ 2017-04-20 8:09 ` Sumit Semwal
0 siblings, 0 replies; 13+ messages in thread
From: Sumit Semwal @ 2017-04-20 8:09 UTC (permalink / raw)
To: Marek Szyprowski
Cc: Logan Gunthorpe, LKML, Intel Graphics Development, linux-media,
DRI mailing list, linux-tegra, devel, David Airlie,
Thierry Reding, Arve Hjønnevåg, Daniel Vetter,
Alexandre Courbot, Thomas Hellstrom, Sinclair Yeh, Russell King,
Christoph Hellwig, Tomi Valkeinen, VMware Graphics, Laura Abbott,
Pawel Osciak, Stephen Warren, Riley Andrews,
Mauro Carvalho Chehab, Greg Kroah-Hartman, Kyungmin Park
Hi Marek,
Thanks!
On 20 April 2017 at 13:36, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
> Hi All,
>
> On 2017-04-20 09:51, Daniel Vetter wrote:
>>
>> On Wed, Apr 19, 2017 at 01:36:10PM -0600, Logan Gunthorpe wrote:
>>>
>>> Seeing the kunmap_atomic dma_buf_ops share the same name with a macro
>>> in highmem.h, the former can be aliased if any dma-buf user includes
>>> that header.
>>>
>>> I'm personally trying to include highmem.h inside scatterlist.h and this
>>> breaks the dma-buf code proper.
>>>
>>> Christoph Hellwig suggested [1] renaming it and pushing this patch ASAP.
>>>
>>> To maintain consistency I've renamed all four of kmap* and kunmap* to be
>>> map* and unmap*. (Even though only kmap_atomic presently conflicts.)
>>>
>>> [1] https://www.spinics.net/lists/target-devel/msg15070.html
>>>
>>> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
>>> Reviewed-by: Sinclair Yeh <syeh@vmware.com>
>>
>> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>>
>> Probably simplest if we pull this in through the drm-misc tree for 4.12.
>> Can we have an ack for the v4l side for that pls?
>
>
> For the V4L2/videobuf2:
> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
>
I will queue it up for drm-misc-fixes so it gets into 4.12.
>
>
>> Thanks, Daniel
Best,
Sumit.
>>>
>>> ---
>>>
>>> Changes since v1:
>>>
>>> - Added the missing tegra driver (noticed by kbuild robot)
>>> - Rebased off of drm-intel-next to get the i915 selftest that is new
>>> - Fixed nits Sinclair pointed out.
>>>
>>> drivers/dma-buf/dma-buf.c | 16 ++++++++--------
>>> drivers/gpu/drm/armada/armada_gem.c | 8 ++++----
>>> drivers/gpu/drm/drm_prime.c | 8 ++++----
>>> drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 ++++----
>>> drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 8 ++++----
>>> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 8 ++++----
>>> drivers/gpu/drm/tegra/gem.c | 8 ++++----
>>> drivers/gpu/drm/udl/udl_dmabuf.c | 8 ++++----
>>> drivers/gpu/drm/vmwgfx/vmwgfx_prime.c | 8 ++++----
>>> drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 ++--
>>> drivers/media/v4l2-core/videobuf2-dma-sg.c | 4 ++--
>>> drivers/media/v4l2-core/videobuf2-vmalloc.c | 4 ++--
>>> drivers/staging/android/ion/ion.c | 8 ++++----
>>> include/linux/dma-buf.h | 22
>>> +++++++++++-----------
>>> 14 files changed, 61 insertions(+), 61 deletions(-)
>>>
>>> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
>>> index f72aaac..512bdbc 100644
>>> --- a/drivers/dma-buf/dma-buf.c
>>> +++ b/drivers/dma-buf/dma-buf.c
>>> @@ -405,8 +405,8 @@ struct dma_buf *dma_buf_export(const struct
>>> dma_buf_export_info *exp_info)
>>> || !exp_info->ops->map_dma_buf
>>> || !exp_info->ops->unmap_dma_buf
>>> || !exp_info->ops->release
>>> - || !exp_info->ops->kmap_atomic
>>> - || !exp_info->ops->kmap
>>> + || !exp_info->ops->map_atomic
>>> + || !exp_info->ops->map
>>> || !exp_info->ops->mmap)) {
>>> return ERR_PTR(-EINVAL);
>>> }
>>> @@ -872,7 +872,7 @@ void *dma_buf_kmap_atomic(struct dma_buf *dmabuf,
>>> unsigned long page_num)
>>> {
>>> WARN_ON(!dmabuf);
>>>
>>> - return dmabuf->ops->kmap_atomic(dmabuf, page_num);
>>> + return dmabuf->ops->map_atomic(dmabuf, page_num);
>>> }
>>> EXPORT_SYMBOL_GPL(dma_buf_kmap_atomic);
>>>
>>> @@ -889,8 +889,8 @@ void dma_buf_kunmap_atomic(struct dma_buf *dmabuf,
>>> unsigned long page_num,
>>> {
>>> WARN_ON(!dmabuf);
>>>
>>> - if (dmabuf->ops->kunmap_atomic)
>>> - dmabuf->ops->kunmap_atomic(dmabuf, page_num, vaddr);
>>> + if (dmabuf->ops->unmap_atomic)
>>> + dmabuf->ops->unmap_atomic(dmabuf, page_num, vaddr);
>>> }
>>> EXPORT_SYMBOL_GPL(dma_buf_kunmap_atomic);
>>>
>>> @@ -907,7 +907,7 @@ void *dma_buf_kmap(struct dma_buf *dmabuf, unsigned
>>> long page_num)
>>> {
>>> WARN_ON(!dmabuf);
>>>
>>> - return dmabuf->ops->kmap(dmabuf, page_num);
>>> + return dmabuf->ops->map(dmabuf, page_num);
>>> }
>>> EXPORT_SYMBOL_GPL(dma_buf_kmap);
>>>
>>> @@ -924,8 +924,8 @@ void dma_buf_kunmap(struct dma_buf *dmabuf, unsigned
>>> long page_num,
>>> {
>>> WARN_ON(!dmabuf);
>>>
>>> - if (dmabuf->ops->kunmap)
>>> - dmabuf->ops->kunmap(dmabuf, page_num, vaddr);
>>> + if (dmabuf->ops->unmap)
>>> + dmabuf->ops->unmap(dmabuf, page_num, vaddr);
>>> }
>>> EXPORT_SYMBOL_GPL(dma_buf_kunmap);
>>>
>>> diff --git a/drivers/gpu/drm/armada/armada_gem.c
>>> b/drivers/gpu/drm/armada/armada_gem.c
>>> index 1597458..d6c2a5d 100644
>>> --- a/drivers/gpu/drm/armada/armada_gem.c
>>> +++ b/drivers/gpu/drm/armada/armada_gem.c
>>> @@ -529,10 +529,10 @@ static const struct dma_buf_ops
>>> armada_gem_prime_dmabuf_ops = {
>>> .map_dma_buf = armada_gem_prime_map_dma_buf,
>>> .unmap_dma_buf = armada_gem_prime_unmap_dma_buf,
>>> .release = drm_gem_dmabuf_release,
>>> - .kmap_atomic = armada_gem_dmabuf_no_kmap,
>>> - .kunmap_atomic = armada_gem_dmabuf_no_kunmap,
>>> - .kmap = armada_gem_dmabuf_no_kmap,
>>> - .kunmap = armada_gem_dmabuf_no_kunmap,
>>> + .map_atomic = armada_gem_dmabuf_no_kmap,
>>> + .unmap_atomic = armada_gem_dmabuf_no_kunmap,
>>> + .map = armada_gem_dmabuf_no_kmap,
>>> + .unmap = armada_gem_dmabuf_no_kunmap,
>>> .mmap = armada_gem_dmabuf_mmap,
>>> };
>>>
>>> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
>>> index 9fb65b7..954eb84 100644
>>> --- a/drivers/gpu/drm/drm_prime.c
>>> +++ b/drivers/gpu/drm/drm_prime.c
>>> @@ -403,10 +403,10 @@ static const struct dma_buf_ops
>>> drm_gem_prime_dmabuf_ops = {
>>> .map_dma_buf = drm_gem_map_dma_buf,
>>> .unmap_dma_buf = drm_gem_unmap_dma_buf,
>>> .release = drm_gem_dmabuf_release,
>>> - .kmap = drm_gem_dmabuf_kmap,
>>> - .kmap_atomic = drm_gem_dmabuf_kmap_atomic,
>>> - .kunmap = drm_gem_dmabuf_kunmap,
>>> - .kunmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>>> + .map = drm_gem_dmabuf_kmap,
>>> + .map_atomic = drm_gem_dmabuf_kmap_atomic,
>>> + .unmap = drm_gem_dmabuf_kunmap,
>>> + .unmap_atomic = drm_gem_dmabuf_kunmap_atomic,
>>> .mmap = drm_gem_dmabuf_mmap,
>>> .vmap = drm_gem_dmabuf_vmap,
>>> .vunmap = drm_gem_dmabuf_vunmap,
>>> diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>>> b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>>> index 11898cd..f225bf6 100644
>>> --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>>> +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
>>> @@ -200,10 +200,10 @@ static const struct dma_buf_ops i915_dmabuf_ops =
>>> {
>>> .map_dma_buf = i915_gem_map_dma_buf,
>>> .unmap_dma_buf = i915_gem_unmap_dma_buf,
>>> .release = drm_gem_dmabuf_release,
>>> - .kmap = i915_gem_dmabuf_kmap,
>>> - .kmap_atomic = i915_gem_dmabuf_kmap_atomic,
>>> - .kunmap = i915_gem_dmabuf_kunmap,
>>> - .kunmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>>> + .map = i915_gem_dmabuf_kmap,
>>> + .map_atomic = i915_gem_dmabuf_kmap_atomic,
>>> + .unmap = i915_gem_dmabuf_kunmap,
>>> + .unmap_atomic = i915_gem_dmabuf_kunmap_atomic,
>>> .mmap = i915_gem_dmabuf_mmap,
>>> .vmap = i915_gem_dmabuf_vmap,
>>> .vunmap = i915_gem_dmabuf_vunmap,
>>> diff --git a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>>> b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>>> index 99da8f4..302f7d1 100644
>>> --- a/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>>> +++ b/drivers/gpu/drm/i915/selftests/mock_dmabuf.c
>>> @@ -129,10 +129,10 @@ static const struct dma_buf_ops mock_dmabuf_ops =
>>> {
>>> .map_dma_buf = mock_map_dma_buf,
>>> .unmap_dma_buf = mock_unmap_dma_buf,
>>> .release = mock_dmabuf_release,
>>> - .kmap = mock_dmabuf_kmap,
>>> - .kmap_atomic = mock_dmabuf_kmap_atomic,
>>> - .kunmap = mock_dmabuf_kunmap,
>>> - .kunmap_atomic = mock_dmabuf_kunmap_atomic,
>>> + .map = mock_dmabuf_kmap,
>>> + .map_atomic = mock_dmabuf_kmap_atomic,
>>> + .unmap = mock_dmabuf_kunmap,
>>> + .unmap_atomic = mock_dmabuf_kunmap_atomic,
>>> .mmap = mock_dmabuf_mmap,
>>> .vmap = mock_dmabuf_vmap,
>>> .vunmap = mock_dmabuf_vunmap,
>>> diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>>> b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>>> index ee5883f..0dbe030 100644
>>> --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>>> +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
>>> @@ -160,10 +160,10 @@ static struct dma_buf_ops omap_dmabuf_ops = {
>>> .release = omap_gem_dmabuf_release,
>>> .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
>>> .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
>>> - .kmap_atomic = omap_gem_dmabuf_kmap_atomic,
>>> - .kunmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>>> - .kmap = omap_gem_dmabuf_kmap,
>>> - .kunmap = omap_gem_dmabuf_kunmap,
>>> + .map_atomic = omap_gem_dmabuf_kmap_atomic,
>>> + .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
>>> + .map = omap_gem_dmabuf_kmap,
>>> + .unmap = omap_gem_dmabuf_kunmap,
>>> .mmap = omap_gem_dmabuf_mmap,
>>> };
>>>
>>> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
>>> index 17e62ec..8672f5d 100644
>>> --- a/drivers/gpu/drm/tegra/gem.c
>>> +++ b/drivers/gpu/drm/tegra/gem.c
>>> @@ -619,10 +619,10 @@ static const struct dma_buf_ops
>>> tegra_gem_prime_dmabuf_ops = {
>>> .map_dma_buf = tegra_gem_prime_map_dma_buf,
>>> .unmap_dma_buf = tegra_gem_prime_unmap_dma_buf,
>>> .release = tegra_gem_prime_release,
>>> - .kmap_atomic = tegra_gem_prime_kmap_atomic,
>>> - .kunmap_atomic = tegra_gem_prime_kunmap_atomic,
>>> - .kmap = tegra_gem_prime_kmap,
>>> - .kunmap = tegra_gem_prime_kunmap,
>>> + .map_atomic = tegra_gem_prime_kmap_atomic,
>>> + .unmap_atomic = tegra_gem_prime_kunmap_atomic,
>>> + .map = tegra_gem_prime_kmap,
>>> + .unmap = tegra_gem_prime_kunmap,
>>> .mmap = tegra_gem_prime_mmap,
>>> .vmap = tegra_gem_prime_vmap,
>>> .vunmap = tegra_gem_prime_vunmap,
>>> diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c
>>> b/drivers/gpu/drm/udl/udl_dmabuf.c
>>> index ac90ffd..ed0e636 100644
>>> --- a/drivers/gpu/drm/udl/udl_dmabuf.c
>>> +++ b/drivers/gpu/drm/udl/udl_dmabuf.c
>>> @@ -191,10 +191,10 @@ static struct dma_buf_ops udl_dmabuf_ops = {
>>> .detach = udl_detach_dma_buf,
>>> .map_dma_buf = udl_map_dma_buf,
>>> .unmap_dma_buf = udl_unmap_dma_buf,
>>> - .kmap = udl_dmabuf_kmap,
>>> - .kmap_atomic = udl_dmabuf_kmap_atomic,
>>> - .kunmap = udl_dmabuf_kunmap,
>>> - .kunmap_atomic = udl_dmabuf_kunmap_atomic,
>>> + .map = udl_dmabuf_kmap,
>>> + .map_atomic = udl_dmabuf_kmap_atomic,
>>> + .unmap = udl_dmabuf_kunmap,
>>> + .unmap_atomic = udl_dmabuf_kunmap_atomic,
>>> .mmap = udl_dmabuf_mmap,
>>> .release = drm_gem_dmabuf_release,
>>> };
>>> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>>> b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>>> index 31fe32d..0d42a46 100644
>>> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>>> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_prime.c
>>> @@ -108,10 +108,10 @@ const struct dma_buf_ops vmw_prime_dmabuf_ops = {
>>> .map_dma_buf = vmw_prime_map_dma_buf,
>>> .unmap_dma_buf = vmw_prime_unmap_dma_buf,
>>> .release = NULL,
>>> - .kmap = vmw_prime_dmabuf_kmap,
>>> - .kmap_atomic = vmw_prime_dmabuf_kmap_atomic,
>>> - .kunmap = vmw_prime_dmabuf_kunmap,
>>> - .kunmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>>> + .map = vmw_prime_dmabuf_kmap,
>>> + .map_atomic = vmw_prime_dmabuf_kmap_atomic,
>>> + .unmap = vmw_prime_dmabuf_kunmap,
>>> + .unmap_atomic = vmw_prime_dmabuf_kunmap_atomic,
>>> .mmap = vmw_prime_dmabuf_mmap,
>>> .vmap = vmw_prime_dmabuf_vmap,
>>> .vunmap = vmw_prime_dmabuf_vunmap,
>>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>>> b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>>> index fb6a177..2db0413 100644
>>> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>>> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>>> @@ -356,8 +356,8 @@ static struct dma_buf_ops vb2_dc_dmabuf_ops = {
>>> .detach = vb2_dc_dmabuf_ops_detach,
>>> .map_dma_buf = vb2_dc_dmabuf_ops_map,
>>> .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap,
>>> - .kmap = vb2_dc_dmabuf_ops_kmap,
>>> - .kmap_atomic = vb2_dc_dmabuf_ops_kmap,
>>> + .map = vb2_dc_dmabuf_ops_kmap,
>>> + .map_atomic = vb2_dc_dmabuf_ops_kmap,
>>> .vmap = vb2_dc_dmabuf_ops_vmap,
>>> .mmap = vb2_dc_dmabuf_ops_mmap,
>>> .release = vb2_dc_dmabuf_ops_release,
>>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>>> b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>>> index ecff8f4..6fd1343 100644
>>> --- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
>>> +++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
>>> @@ -504,8 +504,8 @@ static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
>>> .detach = vb2_dma_sg_dmabuf_ops_detach,
>>> .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
>>> .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
>>> - .kmap = vb2_dma_sg_dmabuf_ops_kmap,
>>> - .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>>> + .map = vb2_dma_sg_dmabuf_ops_kmap,
>>> + .map_atomic = vb2_dma_sg_dmabuf_ops_kmap,
>>> .vmap = vb2_dma_sg_dmabuf_ops_vmap,
>>> .mmap = vb2_dma_sg_dmabuf_ops_mmap,
>>> .release = vb2_dma_sg_dmabuf_ops_release,
>>> diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c
>>> b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>>> index 3f77814..27d1db3 100644
>>> --- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
>>> +++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
>>> @@ -342,8 +342,8 @@ static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
>>> .detach = vb2_vmalloc_dmabuf_ops_detach,
>>> .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
>>> .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
>>> - .kmap = vb2_vmalloc_dmabuf_ops_kmap,
>>> - .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>>> + .map = vb2_vmalloc_dmabuf_ops_kmap,
>>> + .map_atomic = vb2_vmalloc_dmabuf_ops_kmap,
>>> .vmap = vb2_vmalloc_dmabuf_ops_vmap,
>>> .mmap = vb2_vmalloc_dmabuf_ops_mmap,
>>> .release = vb2_vmalloc_dmabuf_ops_release,
>>> diff --git a/drivers/staging/android/ion/ion.c
>>> b/drivers/staging/android/ion/ion.c
>>> index f45115f..95a7f16 100644
>>> --- a/drivers/staging/android/ion/ion.c
>>> +++ b/drivers/staging/android/ion/ion.c
>>> @@ -1020,10 +1020,10 @@ static const struct dma_buf_ops dma_buf_ops = {
>>> .release = ion_dma_buf_release,
>>> .begin_cpu_access = ion_dma_buf_begin_cpu_access,
>>> .end_cpu_access = ion_dma_buf_end_cpu_access,
>>> - .kmap_atomic = ion_dma_buf_kmap,
>>> - .kunmap_atomic = ion_dma_buf_kunmap,
>>> - .kmap = ion_dma_buf_kmap,
>>> - .kunmap = ion_dma_buf_kunmap,
>>> + .map_atomic = ion_dma_buf_kmap,
>>> + .unmap_atomic = ion_dma_buf_kunmap,
>>> + .map = ion_dma_buf_kmap,
>>> + .unmap = ion_dma_buf_kunmap,
>>> };
>>>
>>> struct dma_buf *ion_share_dma_buf(struct ion_client *client,
>>> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
>>> index bfb3704..79f27d6 100644
>>> --- a/include/linux/dma-buf.h
>>> +++ b/include/linux/dma-buf.h
>>> @@ -39,13 +39,13 @@ struct dma_buf_attachment;
>>>
>>> /**
>>> * struct dma_buf_ops - operations possible on struct dma_buf
>>> - * @kmap_atomic: maps a page from the buffer into kernel address
>>> - * space, users may not block until the subsequent unmap
>>> call.
>>> - * This callback must not sleep.
>>> - * @kunmap_atomic: [optional] unmaps a atomically mapped page from the
>>> buffer.
>>> - * This Callback must not sleep.
>>> - * @kmap: maps a page from the buffer into kernel address space.
>>> - * @kunmap: [optional] unmaps a page from the buffer.
>>> + * @map_atomic: 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.
>>> + * @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.
>>> * @vunmap: [optional] unmaps a vmap from the buffer
>>> @@ -206,10 +206,10 @@ struct dma_buf_ops {
>>> * to be restarted.
>>> */
>>> int (*end_cpu_access)(struct dma_buf *, enum dma_data_direction);
>>> - void *(*kmap_atomic)(struct dma_buf *, unsigned long);
>>> - void (*kunmap_atomic)(struct dma_buf *, unsigned long, void *);
>>> - void *(*kmap)(struct dma_buf *, unsigned long);
>>> - void (*kunmap)(struct dma_buf *, unsigned long, void *);
>>> + void *(*map_atomic)(struct dma_buf *, unsigned long);
>>> + void (*unmap_atomic)(struct dma_buf *, unsigned long, void *);
>>> + void *(*map)(struct dma_buf *, unsigned long);
>>> + void (*unmap)(struct dma_buf *, unsigned long, void *);
>>>
>>> /**
>>> * @mmap:
>
>
> Best regards
> --
> Marek Szyprowski, PhD
> Samsung R&D Institute Poland
>
--
Thanks and regards,
Sumit Semwal
Linaro Mobile Group - Kernel Team Lead
Linaro.org │ Open source software for ARM SoCs
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-04-20 8:10 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-19 19:36 [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro Logan Gunthorpe
2017-04-19 19:36 ` Logan Gunthorpe
2017-04-19 19:57 ` ✓ Fi.CI.BAT: success for dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro (rev2) Patchwork
[not found] ` <1492630570-879-1-git-send-email-logang-OTvnGxWRz7hWk0Htik3J/w@public.gmane.org>
2017-04-20 0:28 ` [PATCH v2] dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro Laura Abbott
2017-04-20 0:28 ` Laura Abbott
2017-04-20 7:51 ` [Intel-gfx] " Daniel Vetter
2017-04-20 7:51 ` Daniel Vetter
2017-04-20 8:01 ` Sumit Semwal
2017-04-20 8:01 ` [Intel-gfx] " Sumit Semwal
[not found] ` <20170420075054.yvsjzvuwb4yrzfuc-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org>
2017-04-20 8:06 ` Marek Szyprowski
2017-04-20 8:06 ` Marek Szyprowski
2017-04-20 8:09 ` Sumit Semwal
2017-04-20 8:09 ` Sumit Semwal
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.