summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoonyoung Shim <jy0922.shim@samsung.com>2013-06-28 14:24:53 +0900
committerChanho Park <chanho61.park@samsung.com>2014-11-21 19:12:23 +0900
commit409dab234bc53888679581a0df968638f3ff90ba (patch)
tree2b138611d81848e6c65539780c934a6356b83f7e
parent8423b4dac06cd2f2e12601af7cf9af1c6edd7022 (diff)
downloadlinux-3.10-409dab234bc53888679581a0df968638f3ff90ba.tar.gz
linux-3.10-409dab234bc53888679581a0df968638f3ff90ba.tar.bz2
linux-3.10-409dab234bc53888679581a0df968638f3ff90ba.zip
drm: add mmap function to prime helpers
This adds to call low-level mmap() from prime helpers. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_prime.c8
-rw-r--r--include/drm/drmP.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index ae851b04d1b..068a8f2b1da 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -245,7 +245,13 @@ static void drm_gem_dmabuf_kunmap(struct dma_buf *dma_buf,
static int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf,
struct vm_area_struct *vma)
{
- return -EINVAL;
+ struct drm_gem_object *obj = dma_buf->priv;
+ struct drm_device *dev = obj->dev;
+
+ if (!dev->driver->gem_prime_mmap)
+ return -ENOSYS;
+
+ return dev->driver->gem_prime_mmap(obj, vma);
}
static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = {
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index a6128a6513b..c3f97ada401 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -940,6 +940,8 @@ struct drm_driver {
struct sg_table *sgt);
void *(*gem_prime_vmap)(struct drm_gem_object *obj);
void (*gem_prime_vunmap)(struct drm_gem_object *obj, void *vaddr);
+ int (*gem_prime_mmap)(struct drm_gem_object *obj,
+ struct vm_area_struct *vma);
/* vga arb irq handler */
void (*vgaarb_irq)(struct drm_device *dev, bool state);