Commit b9578c49 authored by Barry Song's avatar Barry Song Committed by Sumit Semwal

dma-buf/heaps: Correct the types of fd_flags and heap_flags

dma_heap_allocation_data defines the UAPI as follows:

 struct dma_heap_allocation_data {
        __u64 len;
        __u32 fd;
        __u32 fd_flags;
        __u64 heap_flags;
 };

But dma heaps are casting both fd_flags and heap_flags into
unsigned long. This patch makes dma heaps - cma heap and
system heap have consistent types with UAPI.
Signed-off-by: default avatarBarry Song <v-songbaohua@oppo.com>
Acked-by: default avatarJohn Stultz <jstultz@google.com>
Reviewed-by: default avatarCarlos Llamas <cmllamas@google.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240606020213.49854-1-21cnbao@gmail.com
parent 72533b67
...@@ -274,8 +274,8 @@ static const struct dma_buf_ops cma_heap_buf_ops = { ...@@ -274,8 +274,8 @@ static const struct dma_buf_ops cma_heap_buf_ops = {
static struct dma_buf *cma_heap_allocate(struct dma_heap *heap, static struct dma_buf *cma_heap_allocate(struct dma_heap *heap,
unsigned long len, unsigned long len,
unsigned long fd_flags, u32 fd_flags,
unsigned long heap_flags) u64 heap_flags)
{ {
struct cma_heap *cma_heap = dma_heap_get_drvdata(heap); struct cma_heap *cma_heap = dma_heap_get_drvdata(heap);
struct cma_heap_buffer *buffer; struct cma_heap_buffer *buffer;
......
...@@ -333,8 +333,8 @@ static struct page *alloc_largest_available(unsigned long size, ...@@ -333,8 +333,8 @@ static struct page *alloc_largest_available(unsigned long size,
static struct dma_buf *system_heap_allocate(struct dma_heap *heap, static struct dma_buf *system_heap_allocate(struct dma_heap *heap,
unsigned long len, unsigned long len,
unsigned long fd_flags, u32 fd_flags,
unsigned long heap_flags) u64 heap_flags)
{ {
struct system_heap_buffer *buffer; struct system_heap_buffer *buffer;
DEFINE_DMA_BUF_EXPORT_INFO(exp_info); DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
......
...@@ -23,8 +23,8 @@ struct dma_heap; ...@@ -23,8 +23,8 @@ struct dma_heap;
struct dma_heap_ops { struct dma_heap_ops {
struct dma_buf *(*allocate)(struct dma_heap *heap, struct dma_buf *(*allocate)(struct dma_heap *heap,
unsigned long len, unsigned long len,
unsigned long fd_flags, u32 fd_flags,
unsigned long heap_flags); u64 heap_flags);
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment