Skip to contentSkip to conversation

Naming changes for DMA-BUF Heaps in drm-misc-next

PATCH In review Andrew F. Davis 2 participants 5 messages Dec 16, 2019

Subsystems (3)
lore
Share & tools
lore
#3 lore raw

PATCH 2/2 dma-buf: heaps: Remove redundant heap identifier from system heap name

In reply to Andrew F. Davis

The heaps are already in a directory of heaps, adding _heap to a heap name is redundant. This patch is only a name change, no logic is changed.

---
 drivers/dma-buf/heaps/system_heap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma-buf/heaps/system_heap.c +1 -1
index 1aa01e98c595..0bf688e3c023 100644
@@ -109,7 +109,7 @@ static int system_heap_create(void)
 	struct dma_heap_export_info exp_info;
 	int ret = 0;
 
-	exp_info.name = "system_heap";
+	exp_info.name = "system";
 	exp_info.ops = &system_heap_ops;
 	exp_info.priv = NULL;
 
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH 1/2 dma-buf: heaps: Use _IOCTL_ for userspace IOCTL identifier

In reply to Andrew F. Davis

This is more consistent with the DMA and DRM frameworks convention. This patch is only a name change, no logic is changed.

---
 drivers/dma-buf/dma-heap.c                         | 4 ++--
 include/uapi/linux/dma-heap.h                      | 4 ++--
 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/dma-buf/dma-heap.c +2 -2
index 4f04d104ae61..a24721496114 100644
@@ -107,7 +107,7 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data)
 }
 
 unsigned int dma_heap_ioctl_cmds[] = {
-	DMA_HEAP_IOC_ALLOC,
+	DMA_HEAP_IOCTL_ALLOC,
 };
 
 static long dma_heap_ioctl(struct file *file, unsigned int ucmd,
@@ -153,7 +153,7 @@ static long dma_heap_ioctl(struct file *file, unsigned int ucmd,
 		memset(kdata + in_size, 0, ksize - in_size);
 
 	switch (kcmd) {
-	case DMA_HEAP_IOC_ALLOC:
+	case DMA_HEAP_IOCTL_ALLOC:
 		ret = dma_heap_ioctl_allocate(file, kdata);
 		break;
 	default:
include/uapi/linux/dma-heap.h +2 -2
index 73e7f66c1cae..6f84fa08e074 100644
@@ -42,12 +42,12 @@ struct dma_heap_allocation_data {
 #define DMA_HEAP_IOC_MAGIC		'H'
 
 /**
- * DOC: DMA_HEAP_IOC_ALLOC - allocate memory from pool
+ * DOC: DMA_HEAP_IOCTL_ALLOC - allocate memory from pool
  *
  * Takes a dma_heap_allocation_data struct and returns it with the fd field
  * populated with the dmabuf handle of the allocation.
  */
-#define DMA_HEAP_IOC_ALLOC	_IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\
+#define DMA_HEAP_IOCTL_ALLOC	_IOWR(DMA_HEAP_IOC_MAGIC, 0x0,\
 				      struct dma_heap_allocation_data)
 
 #endif /* _UAPI_LINUX_DMABUF_POOL_H */
tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c +1 -1
index 3e53ad331bdc..cd5e1f602ac9 100644
@@ -116,7 +116,7 @@ static int dmabuf_heap_alloc_fdflags(int fd, size_t len, unsigned int fd_flags,
 	if (!dmabuf_fd)
 		return -EINVAL;
 
-	ret = ioctl(fd, DMA_HEAP_IOC_ALLOC, &data);
+	ret = ioctl(fd, DMA_HEAP_IOCTL_ALLOC, &data);
 	if (ret < 0)
 		return ret;
 	*dmabuf_fd = (int)data.fd;
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#0 lore raw

cover Naming changes for DMA-BUF Heaps in drm-misc-next

Hello all,

This is a quick series to cleanup some minor naming issues in the new DMA-BUF Heaps series on next before the names become ABI.

Thanks,
Andrew

Andrew F. Davis (2):
dma-buf: heaps: Use _IOCTL_ for userspace IOCTL identifier
dma-buf: heaps: Remove redundant heap identifier from system heap name

 drivers/dma-buf/dma-heap.c                         | 4 ++--
 drivers/dma-buf/heaps/system_heap.c                | 2 +-
 include/uapi/linux/dma-heap.h                      | 4 ++--
 tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Acked-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] dma-buf: heaps: Use _IOCTL_ for userspace IOCTL identifier

In reply to Andrew F. Davis
Quoted 5 lines · Andrew F. Davis

This is more consistent with the DMA and DRM frameworks convention. This patch is only a name change, no logic is changed.

Do wish we had caught/made this tweak earlier, but I do agree its a more consistent name.

I've also reworked my userland changes to use this name, and will update them here shortly (assuming there's no objection to this).

Sumit: Mind queuing for drm-misc-next?

thanks
-john
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Acked-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] dma-buf: heaps: Remove redundant heap identifier from system heap name

In reply to Andrew F. Davis
Quoted 5 lines · Andrew F. Davis

The heaps are already in a directory of heaps, adding _heap to a heap name is redundant. This patch is only a name change, no logic is changed.

Again, do wish we had caught/made this tweak earlier, but this seems sane to me.

I've also reworked my userland changes to use this name, and will update them here shortly (assuming there's no objection to this).

Sumit: Mind queuing for drm-misc-next?

thanks
-john
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel