Commit cf38f41d authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

Revert "videobuf2-dma-contig: Only support if HAVE_GENERIC_DMA_COHERENT"

The right solution is to remove the architecture dependency on
dma_common_get_sgtable(). Revert this patch to apply the right one.

This reverts commit 93049b93.
parent 93049b93
...@@ -226,8 +226,6 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) ...@@ -226,8 +226,6 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma)
/* DMABUF ops for exporters */ /* DMABUF ops for exporters */
/*********************************************/ /*********************************************/
#ifdef HAVE_GENERIC_DMA_COHERENT
struct vb2_dc_attachment { struct vb2_dc_attachment {
struct sg_table sgt; struct sg_table sgt;
enum dma_data_direction dir; enum dma_data_direction dir;
...@@ -418,8 +416,6 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv) ...@@ -418,8 +416,6 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv)
return dbuf; return dbuf;
} }
#endif
/*********************************************/ /*********************************************/
/* callbacks for USERPTR buffers */ /* callbacks for USERPTR buffers */
/*********************************************/ /*********************************************/
...@@ -739,9 +735,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf, ...@@ -739,9 +735,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
const struct vb2_mem_ops vb2_dma_contig_memops = { const struct vb2_mem_ops vb2_dma_contig_memops = {
.alloc = vb2_dc_alloc, .alloc = vb2_dc_alloc,
.put = vb2_dc_put, .put = vb2_dc_put,
#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
.get_dmabuf = vb2_dc_get_dmabuf, .get_dmabuf = vb2_dc_get_dmabuf,
#endif
.cookie = vb2_dc_cookie, .cookie = vb2_dc_cookie,
.vaddr = vb2_dc_vaddr, .vaddr = vb2_dc_vaddr,
.mmap = vb2_dc_mmap, .mmap = vb2_dc_mmap,
......
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