Commit bda3fdaa authored by Laurent Pinchart's avatar Laurent Pinchart

drm/omap: Use drm_gem_mmap_obj() to implement dma-buf mmap

The dma-buf mmap code was copied from the GEM mmap implementation.
Replace it with the new drm_gem_mmap_obj() function.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
parent 1c5aafa6
...@@ -136,10 +136,6 @@ static void omap_gem_dmabuf_kunmap(struct dma_buf *buffer, ...@@ -136,10 +136,6 @@ static void omap_gem_dmabuf_kunmap(struct dma_buf *buffer,
kunmap(pages[page_num]); kunmap(pages[page_num]);
} }
/*
* TODO maybe we can split up drm_gem_mmap to avoid duplicating
* some here.. or at least have a drm_dmabuf_mmap helper.
*/
static int omap_gem_dmabuf_mmap(struct dma_buf *buffer, static int omap_gem_dmabuf_mmap(struct dma_buf *buffer,
struct vm_area_struct *vma) struct vm_area_struct *vma)
{ {
...@@ -149,31 +145,9 @@ static int omap_gem_dmabuf_mmap(struct dma_buf *buffer, ...@@ -149,31 +145,9 @@ static int omap_gem_dmabuf_mmap(struct dma_buf *buffer,
if (WARN_ON(!obj->filp)) if (WARN_ON(!obj->filp))
return -EINVAL; return -EINVAL;
/* Check for valid size. */ ret = drm_gem_mmap_obj(obj, omap_gem_mmap_size(obj), vma);
if (omap_gem_mmap_size(obj) < vma->vm_end - vma->vm_start) { if (ret < 0)
ret = -EINVAL; return ret;
goto out_unlock;
}
if (!obj->dev->driver->gem_vm_ops) {
ret = -EINVAL;
goto out_unlock;
}
vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
vma->vm_ops = obj->dev->driver->gem_vm_ops;
vma->vm_private_data = obj;
vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
/* Take a ref for this mapping of the object, so that the fault
* handler can dereference the mmap offset's pointer to the object.
* This reference is cleaned up by the corresponding vm_close
* (which should happen whether the vma was created by this call, or
* by a vm_open due to mremap or partial unmap or whatever).
*/
vma->vm_ops->open(vma);
out_unlock:
return omap_gem_mmap_obj(obj, vma); return omap_gem_mmap_obj(obj, vma);
} }
......
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