Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daf543b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 521bd5e4 1f58d946

Documentation/dma-buf-sharing.txt

+8 −6
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ The dma_buf buffer sharing API usage contains the following steps: 
				     size_t size, int flags,

				     const char *exp_name)



   If this succeeds, dma_buf_export allocates a dma_buf structure, and returns a

   pointer to the same. It also associates an anonymous file with this buffer,

   so it can be exported. On failure to allocate the dma_buf object, it returns

   NULL.

   If this succeeds, dma_buf_export_named allocates a dma_buf structure, and

   returns a pointer to the same. It also associates an anonymous file with this

   buffer, so it can be exported. On failure to allocate the dma_buf object,

   it returns NULL.



   'exp_name' is the name of exporter - to facilitate information while

   debugging.
@@ -76,7 +76,7 @@ The dma_buf buffer sharing API usage contains the following steps: 
   drivers and/or processes.



   Interface:

      int dma_buf_fd(struct dma_buf *dmabuf)

      int dma_buf_fd(struct dma_buf *dmabuf, int flags)



   This API installs an fd for the anonymous file associated with this buffer;

   returns either 'fd', or error.
@@ -157,7 +157,9 @@ to request use of buffer for allocation. 
   "dma_buf->ops->" indirection from the users of this interface.



   In struct dma_buf_ops, unmap_dma_buf is defined as

      void (*unmap_dma_buf)(struct dma_buf_attachment *, struct sg_table *);

      void (*unmap_dma_buf)(struct dma_buf_attachment *,

                            struct sg_table *,

                            enum dma_data_direction);



   unmap_dma_buf signifies the end-of-DMA for the attachment provided. Like

   map_dma_buf, this API also must be implemented by the exporter.

drivers/dma-buf/fence.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
EXPORT_TRACEPOINT_SYMBOL(fence_annotate_wait_on);

EXPORT_TRACEPOINT_SYMBOL(fence_emit);



/**

/*

 * fence context counter: each execution context should have its own

 * fence context, this allows checking if fences belong to the same

 * context or not. One device can have multiple separate contexts,

include/linux/seqno-fence.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ to_seqno_fence(struct fence *fence) 
 * @context: the execution context this fence is a part of

 * @seqno_ofs: the offset within @sync_buf

 * @seqno: the sequence # to signal on

 * @cond: fence wait condition

 * @ops: the fence_ops for operations on this seqno fence

 *

 * This function initializes a struct seqno_fence with passed parameters,