mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
70 lines
2.4 KiB
Diff
70 lines
2.4 KiB
Diff
|
From 8153056fa1d45394057017843070d3a366dbd918 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Andrew F. Davis" <afd@ti.com>
|
||
|
|
Date: Mon, 16 Dec 2019 08:34:04 -0500
|
||
|
|
Subject: [PATCH] dma-buf: heaps: Use _IOCTL_ for userspace IOCTL
|
||
|
|
identifier
|
||
|
|
|
||
|
|
Commit b3b4346544b571c96d46be615b9db69a601ce4c8 upstream.
|
||
|
|
|
||
|
|
This is more consistent with the DMA and DRM frameworks convention. This
|
||
|
|
patch is only a name change, no logic is changed.
|
||
|
|
|
||
|
|
Signed-off-by: Andrew F. Davis <afd@ti.com>
|
||
|
|
Acked-by: John Stultz <john.stultz@linaro.org>
|
||
|
|
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
|
||
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20191216133405.1001-2-afd@ti.com
|
||
|
|
---
|
||
|
|
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(-)
|
||
|
|
|
||
|
|
--- a/drivers/dma-buf/dma-heap.c
|
||
|
|
+++ b/drivers/dma-buf/dma-heap.c
|
||
|
|
@@ -107,7 +107,7 @@ static long dma_heap_ioctl_allocate(stru
|
||
|
|
}
|
||
|
|
|
||
|
|
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 *
|
||
|
|
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:
|
||
|
|
--- a/include/uapi/linux/dma-heap.h
|
||
|
|
+++ b/include/uapi/linux/dma-heap.h
|
||
|
|
@@ -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 */
|
||
|
|
--- a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
|
||
|
|
+++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
|
||
|
|
@@ -116,7 +116,7 @@ static int dmabuf_heap_alloc_fdflags(int
|
||
|
|
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;
|