mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-14 00:24:41 -04:00
Merge "staging: ion: Allow for attach and detach ops to be overridden"
This commit is contained in:
commit
9da0a58535
1 changed files with 8 additions and 0 deletions
|
|
@ -57,6 +57,10 @@ static int ion_dma_buf_attach(struct dma_buf *dmabuf,
|
|||
struct ion_dma_buf_attachment *a;
|
||||
struct sg_table *table;
|
||||
struct ion_buffer *buffer = dmabuf->priv;
|
||||
struct ion_heap *heap = buffer->heap;
|
||||
|
||||
if (heap->buf_ops.attach)
|
||||
return heap->buf_ops.attach(dmabuf, attachment);
|
||||
|
||||
a = kzalloc(sizeof(*a), GFP_KERNEL);
|
||||
if (!a)
|
||||
|
|
@ -86,6 +90,10 @@ static void ion_dma_buf_detatch(struct dma_buf *dmabuf,
|
|||
{
|
||||
struct ion_dma_buf_attachment *a = attachment->priv;
|
||||
struct ion_buffer *buffer = dmabuf->priv;
|
||||
struct ion_heap *heap = buffer->heap;
|
||||
|
||||
if (heap->buf_ops.detach)
|
||||
return heap->buf_ops.detach(dmabuf, attachment);
|
||||
|
||||
mutex_lock(&buffer->lock);
|
||||
list_del(&a->list);
|
||||
|
|
|
|||
Loading…
Reference in a new issue