Merge 3.5-rc5 into usb-next

[cascardo/linux.git] / drivers / gpu / drm / nouveau / nouveau_prime.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c
index c58aab7..a25cf2c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2011 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Dave Airlie
+ */
 
 #include "drmP.h"
 #include "drm.h"
@@ -61,6 +84,48 @@ 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 void *nouveau_gem_prime_vmap(struct dma_buf *dma_buf)
+{
+       struct nouveau_bo *nvbo = dma_buf->priv;
+       struct drm_device *dev = nvbo->gem->dev;
+       int ret;
+
+       mutex_lock(&dev->struct_mutex);
+       if (nvbo->vmapping_count) {
+               nvbo->vmapping_count++;
+               goto out_unlock;
+       }
+
+       ret = ttm_bo_kmap(&nvbo->bo, 0, nvbo->bo.num_pages,
+                         &nvbo->dma_buf_vmap);
+       if (ret) {
+               mutex_unlock(&dev->struct_mutex);
+               return ERR_PTR(ret);
+       }
+       nvbo->vmapping_count = 1;
+out_unlock:
+       mutex_unlock(&dev->struct_mutex);
+       return nvbo->dma_buf_vmap.virtual;
+}
+
+static void nouveau_gem_prime_vunmap(struct dma_buf *dma_buf, void *vaddr)
+{
+       struct nouveau_bo *nvbo = dma_buf->priv;
+       struct drm_device *dev = nvbo->gem->dev;
+
+       mutex_lock(&dev->struct_mutex);
+       nvbo->vmapping_count--;
+       if (nvbo->vmapping_count == 0) {
+               ttm_bo_kunmap(&nvbo->dma_buf_vmap);
+       }
+       mutex_unlock(&dev->struct_mutex);
+}
+
 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 +134,9 @@ 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,
+       .vmap = nouveau_gem_prime_vmap,
+       .vunmap = nouveau_gem_prime_vunmap,
 };
 
 static int