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

Commit c60520fa authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vb2-dma-contig: let mmap method to use dma_mmap_coherent call 



Let mmap method to use dma_mmap_coherent call.  Moreover, this patch removes
vb2_mmap_pfn_range from videobuf2 helpers as it was suggested by Laurent
Pinchart.  The function is no longer used in vb2 code.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarTomasz Stanislawski <t.stanislaws@samsung.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9bd09fd7

drivers/media/v4l2-core/videobuf2-dma-contig.c

+26 −2
Original line number Diff line number Diff line
@@ -178,14 +178,38 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) 
static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma)

{

	struct vb2_dc_buf *buf = buf_priv;

	int ret;



	if (!buf) {

		printk(KERN_ERR "No buffer to map\n");

		return -EINVAL;

	}



	return vb2_mmap_pfn_range(vma, buf->dma_addr, buf->size,

				  &vb2_common_vm_ops, &buf->handler);

	/*

	 * dma_mmap_* uses vm_pgoff as in-buffer offset, but we want to

	 * map whole buffer

	 */

	vma->vm_pgoff = 0;



	ret = dma_mmap_coherent(buf->dev, vma, buf->vaddr,

		buf->dma_addr, buf->size);



	if (ret) {

		pr_err("Remapping memory failed, error: %d\n", ret);

		return ret;

	}



	vma->vm_flags		|= VM_DONTEXPAND | VM_DONTDUMP;

	vma->vm_private_data	= &buf->handler;

	vma->vm_ops		= &vb2_common_vm_ops;



	vma->vm_ops->open(vma);



	pr_debug("%s: mapped dma addr 0x%08lx at 0x%08lx, size %ld\n",

		__func__, (unsigned long)buf->dma_addr, vma->vm_start,

		buf->size);



	return 0;

}



/*********************************************/

drivers/media/v4l2-core/videobuf2-memops.c

+0 −40
Original line number Diff line number Diff line
@@ -136,46 +136,6 @@ int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size, 
}

EXPORT_SYMBOL_GPL(vb2_get_contig_userptr);



/**

 * vb2_mmap_pfn_range() - map physical pages to userspace

 * @vma:	virtual memory region for the mapping

 * @paddr:	starting physical address of the memory to be mapped

 * @size:	size of the memory to be mapped

 * @vm_ops:	vm operations to be assigned to the created area

 * @priv:	private data to be associated with the area

 *

 * Returns 0 on success.

 */

int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,

				unsigned long size,

				const struct vm_operations_struct *vm_ops,

				void *priv)

{

	int ret;



	size = min_t(unsigned long, vma->vm_end - vma->vm_start, size);



	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	ret = remap_pfn_range(vma, vma->vm_start, paddr >> PAGE_SHIFT,

				size, vma->vm_page_prot);

	if (ret) {

		printk(KERN_ERR "Remapping memory failed, error: %d\n", ret);

		return ret;

	}



	vma->vm_flags		|= VM_DONTEXPAND | VM_DONTDUMP;

	vma->vm_private_data	= priv;

	vma->vm_ops		= vm_ops;



	vma->vm_ops->open(vma);



	pr_debug("%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n",

			__func__, paddr, vma->vm_start, size);



	return 0;

}

EXPORT_SYMBOL_GPL(vb2_mmap_pfn_range);



/**

 * vb2_common_vm_open() - increase refcount of the vma

 * @vma:	virtual memory region for the mapping

include/media/videobuf2-memops.h

+0 −5
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ extern const struct vm_operations_struct vb2_common_vm_ops; 
int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size,

			   struct vm_area_struct **res_vma, dma_addr_t *res_pa);



int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,

				unsigned long size,

				const struct vm_operations_struct *vm_ops,

				void *priv);



struct vm_area_struct *vb2_get_vma(struct vm_area_struct *vma);

void vb2_put_vma(struct vm_area_struct *vma);