tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf
Pull dma-buf fixes from Sumit Semwal:
"The major changes for 3.17 already went via Greg-KH's tree this time
as well; this is a small pull request for dma-buf - all documentation
related"
* tag 'for-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
dma-buf/fence: Fix one more kerneldoc warning
dma-buf/fence: Fix a kerneldoc warning
Documentation/dma-buf-sharing.txt: update API descriptions
+10
-7
+8
-6
Documentation/dma-buf-sharing.txt
+8
-6
Documentation/dma-buf-sharing.txt
···
56
56
size_t size, int flags,
57
57
const char *exp_name)
58
58
59
-
If this succeeds, dma_buf_export allocates a dma_buf structure, and returns a
60
-
pointer to the same. It also associates an anonymous file with this buffer,
61
-
so it can be exported. On failure to allocate the dma_buf object, it returns
62
-
NULL.
59
+
If this succeeds, dma_buf_export_named allocates a dma_buf structure, and
60
+
returns a pointer to the same. It also associates an anonymous file with this
61
+
buffer, so it can be exported. On failure to allocate the dma_buf object,
62
+
it returns NULL.
63
63
64
64
'exp_name' is the name of exporter - to facilitate information while
65
65
debugging.
···
76
76
drivers and/or processes.
77
77
78
78
Interface:
79
-
int dma_buf_fd(struct dma_buf *dmabuf)
79
+
int dma_buf_fd(struct dma_buf *dmabuf, int flags)
80
80
81
81
This API installs an fd for the anonymous file associated with this buffer;
82
82
returns either 'fd', or error.
···
157
157
"dma_buf->ops->" indirection from the users of this interface.
158
158
159
159
In struct dma_buf_ops, unmap_dma_buf is defined as
160
-
void (*unmap_dma_buf)(struct dma_buf_attachment *, struct sg_table *);
160
+
void (*unmap_dma_buf)(struct dma_buf_attachment *,
161
+
struct sg_table *,
162
+
enum dma_data_direction);
161
163
162
164
unmap_dma_buf signifies the end-of-DMA for the attachment provided. Like
163
165
map_dma_buf, this API also must be implemented by the exporter.
+1
-1
drivers/dma-buf/fence.c
+1
-1
drivers/dma-buf/fence.c
···
29
29
EXPORT_TRACEPOINT_SYMBOL(fence_annotate_wait_on);
30
30
EXPORT_TRACEPOINT_SYMBOL(fence_emit);
31
31
32
-
/**
32
+
/*
33
33
* fence context counter: each execution context should have its own
34
34
* fence context, this allows checking if fences belong to the same
35
35
* context or not. One device can have multiple separate contexts,
+1
include/linux/seqno-fence.h
+1
include/linux/seqno-fence.h
···
62
62
* @context: the execution context this fence is a part of
63
63
* @seqno_ofs: the offset within @sync_buf
64
64
* @seqno: the sequence # to signal on
65
+
* @cond: fence wait condition
65
66
* @ops: the fence_ops for operations on this seqno fence
66
67
*
67
68
* This function initializes a struct seqno_fence with passed parameters,