2 files changed, 41 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 492654f8ee74..2e24022b389a 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -346,6 +346,9 @@ struct radeon_bo {
         /* Constant after initialization */
         struct radeon_device            *rdev;
         struct drm_gem_object           gem_base;
+
+        struct ttm_bo_kmap_obj dma_buf_vmap;
+        int vmapping_count;
 };
 #define gem_to_radeon_bo(gobj) container_of((gobj), struct radeon_bo, gem_base)
 
diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index 37ff6bfb8c72..8ddab4c76710 100644
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -90,6 +90,42 @@ static int radeon_gem_prime_mmap(struct dma_buf *dma_buf, struct vm_area_struct
         return -EINVAL;
 }
 
+static void *radeon_gem_prime_vmap(struct dma_buf *dma_buf)
+{
+        struct radeon_bo *bo = dma_buf->priv;
+        struct drm_device *dev = bo->rdev->ddev;
+        int ret;
+
+        mutex_lock(&dev->struct_mutex);
+        if (bo->vmapping_count) {
+                bo->vmapping_count++;
+                goto out_unlock;
+        }
+
+        ret = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.num_pages,
+                          &bo->dma_buf_vmap);
+        if (ret) {
+                mutex_unlock(&dev->struct_mutex);
+                return ERR_PTR(ret);
+        }
+        bo->vmapping_count = 1;
+out_unlock:
+        mutex_unlock(&dev->struct_mutex);
+        return bo->dma_buf_vmap.virtual;
+}
+
+static void radeon_gem_prime_vunmap(struct dma_buf *dma_buf, void *vaddr)
+{
+        struct radeon_bo *bo = dma_buf->priv;
+        struct drm_device *dev = bo->rdev->ddev;
+
+        mutex_lock(&dev->struct_mutex);
+        bo->vmapping_count--;
+        if (bo->vmapping_count == 0) {
+                ttm_bo_kunmap(&bo->dma_buf_vmap);
+        }
+        mutex_unlock(&dev->struct_mutex);
+}
 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,
@@ -99,6 +135,8 @@ const static struct dma_buf_ops radeon_dmabuf_ops =  {
         .kunmap = radeon_gem_kunmap,
         .kunmap_atomic = radeon_gem_kunmap_atomic,
         .mmap = radeon_gem_prime_mmap,
+        .vmap = radeon_gem_prime_vmap,
+        .vunmap = radeon_gem_prime_vunmap,
 };
 
 static int radeon_prime_create(struct drm_device *dev,