From bb91dff5d87bab3e3a8c662aabf459fbf0049764 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 29 May 2012 15:12:24 +0100 Subject: [PATCH] --- yaml --- r: 309699 b: refs/heads/master c: 946c7491b37704016cdbba60915d1de2c79c3b57 h: refs/heads/master i: 309697: 7661fbff3b0343a05297ea12ed4fd507b2a3ec69 309695: 9291771c28294bf03bdf239257c68882cf7429ec v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_prime.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b8626ca07526..29241498482d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1bbc4bff928ed152a1aef2a4b80a65eccc0ce63 +refs/heads/master: 946c7491b37704016cdbba60915d1de2c79c3b57 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_prime.c b/trunk/drivers/gpu/drm/radeon/radeon_prime.c index b8f835d8ecb4..37ff6bfb8c72 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_prime.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_prime.c @@ -85,6 +85,11 @@ static void radeon_gem_kunmap(struct dma_buf *dma_buf, unsigned long page_num, v } +static int radeon_gem_prime_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) +{ + return -EINVAL; +} + const static struct dma_buf_ops radeon_dmabuf_ops = { .map_dma_buf = radeon_gem_map_dma_buf, .unmap_dma_buf = radeon_gem_unmap_dma_buf, @@ -93,6 +98,7 @@ const static struct dma_buf_ops radeon_dmabuf_ops = { .kmap_atomic = radeon_gem_kmap_atomic, .kunmap = radeon_gem_kunmap, .kunmap_atomic = radeon_gem_kunmap_atomic, + .mmap = radeon_gem_prime_mmap, }; static int radeon_prime_create(struct drm_device *dev,