drm/etnaviv: Implement mmap as GEM object function

[linux-2.6-microblaze.git] / drivers / gpu / drm / etnaviv / etnaviv_gem.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index db69f19..8f1b5af 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -130,8 +130,7 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
 {
        pgprot_t vm_page_prot;
 
-       vma->vm_flags &= ~VM_PFNMAP;
-       vma->vm_flags |= VM_MIXEDMAP;
+       vma->vm_flags |= VM_IO | VM_MIXEDMAP | VM_DONTEXPAND | VM_DONTDUMP;
 
        vm_page_prot = vm_get_page_prot(vma->vm_flags);
 
@@ -154,19 +153,11 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
        return 0;
 }
 
-int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma)
+static int etnaviv_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
 {
-       struct etnaviv_gem_object *obj;
-       int ret;
-
-       ret = drm_gem_mmap(filp, vma);
-       if (ret) {
-               DBG("mmap failed: %d", ret);
-               return ret;
-       }
+       struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
 
-       obj = to_etnaviv_bo(vma->vm_private_data);
-       return obj->ops->mmap(obj, vma);
+       return etnaviv_obj->ops->mmap(etnaviv_obj, vma);
 }
 
 static vm_fault_t etnaviv_gem_fault(struct vm_fault *vmf)
@@ -390,14 +381,12 @@ int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op,
        }
 
        if (op & ETNA_PREP_NOSYNC) {
-               if (!dma_resv_test_signaled_rcu(obj->resv,
-                                                         write))
+               if (!dma_resv_test_signaled(obj->resv, write))
                        return -EBUSY;
        } else {
                unsigned long remain = etnaviv_timeout_to_jiffies(timeout);
 
-               ret = dma_resv_wait_timeout_rcu(obj->resv,
-                                                         write, true, remain);
+               ret = dma_resv_wait_timeout(obj->resv, write, true, remain);
                if (ret <= 0)
                        return ret == 0 ? -ETIMEDOUT : ret;
        }
@@ -461,7 +450,7 @@ static void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
                        off, etnaviv_obj->vaddr, obj->size);
 
        rcu_read_lock();
-       fobj = rcu_dereference(robj->fence);
+       fobj = dma_resv_shared_list(robj);
        if (fobj) {
                unsigned int i, shared_count = fobj->shared_count;
 
@@ -471,7 +460,7 @@ static void etnaviv_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
                }
        }
 
-       fence = rcu_dereference(robj->fence_excl);
+       fence = dma_resv_excl_fence(robj);
        if (fence)
                etnaviv_gem_describe_fence(fence, "Exclusive", m);
        rcu_read_unlock();
@@ -569,6 +558,7 @@ static const struct drm_gem_object_funcs etnaviv_gem_object_funcs = {
        .unpin = etnaviv_gem_prime_unpin,
        .get_sg_table = etnaviv_gem_prime_get_sg_table,
        .vmap = etnaviv_gem_prime_vmap,
+       .mmap = etnaviv_gem_mmap,
        .vm_ops = &vm_ops,
 };