summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-05-29 15:11:55 +0100
committerDave Airlie <airlied@redhat.com>2012-05-31 13:13:37 +0100
commite1bbc4bff928ed152a1aef2a4b80a65eccc0ce63 (patch)
treeb9642c7a07ad6e179737399836c720208be8a596 /drivers/gpu
parent2dad9d4d057a080a4ad59c705b3e388af6794576 (diff)
downloadlinux-stable-e1bbc4bff928ed152a1aef2a4b80a65eccc0ce63.tar.gz
linux-stable-e1bbc4bff928ed152a1aef2a4b80a65eccc0ce63.tar.bz2
linux-stable-e1bbc4bff928ed152a1aef2a4b80a65eccc0ce63.zip
nouveau: add stub dma-buf mmap functionality.
This just adds a stub until we have some users in place to test this with. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_prime.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index c58aab7370c5..e2bcd4e54654 100644
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -61,6 +61,11 @@ static void nouveau_gem_kunmap(struct dma_buf *dma_buf, unsigned long page_num,
}
+static int nouveau_gem_prime_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma)
+{
+ return -EINVAL;
+}
+
static const struct dma_buf_ops nouveau_dmabuf_ops = {
.map_dma_buf = nouveau_gem_map_dma_buf,
.unmap_dma_buf = nouveau_gem_unmap_dma_buf,
@@ -69,6 +74,7 @@ static const struct dma_buf_ops nouveau_dmabuf_ops = {
.kmap_atomic = nouveau_gem_kmap_atomic,
.kunmap = nouveau_gem_kunmap,
.kunmap_atomic = nouveau_gem_kunmap_atomic,
+ .mmap = nouveau_gem_prime_mmap,
};
static int