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

Commit 2744be73 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "staging: android: ion: Add support for dma_buf_vmap"

parents ec99174e bec26b11

drivers/staging/android/ion/ion.c

+13 −0
Original line number Diff line number Diff line
@@ -437,6 +437,17 @@ static void ion_dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long offset, 
{

}



static void *ion_dma_buf_vmap(struct dma_buf *dmabuf)

{

	struct ion_buffer *buffer = dmabuf->priv;



	return buffer->vaddr;

}



static void ion_dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr)

{

}



static void ion_sgl_sync_range(struct device *dev, struct scatterlist *sgl,

			       unsigned int nents, unsigned long offset,

			       unsigned long length,
@@ -648,6 +659,8 @@ static const struct dma_buf_ops dma_buf_ops = { 
	.unmap_atomic = ion_dma_buf_kunmap,

	.map = ion_dma_buf_kmap,

	.unmap = ion_dma_buf_kunmap,

	.vmap = ion_dma_buf_vmap,

	.vunmap = ion_dma_buf_vunmap,

	.get_flags = ion_dma_buf_get_flags,

};