1 files changed, 20 insertions, 20 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c
index 244fd38fdb84..ef0832b29ad2 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_vm.c
@@ -172,9 +172,9 @@ nouveau_vm_unmap_pgt(struct nouveau_vm *vm, int big, u32 fpde, u32 lpde)
                         vm->map_pgt(vpgd->obj, pde, vpgt->obj);
                 }
 
-                mutex_unlock(&vm->mm->mutex);
+                mutex_unlock(&vm->mm.mutex);
                 nouveau_gpuobj_ref(NULL, &pgt);
-                mutex_lock(&vm->mm->mutex);
+                mutex_lock(&vm->mm.mutex);
         }
 }
 
@@ -191,18 +191,18 @@ nouveau_vm_map_pgt(struct nouveau_vm *vm, u32 pde, u32 type)
         pgt_size  = (1 << (vm->pgt_bits + 12)) >> type;
         pgt_size *= 8;
 
-        mutex_unlock(&vm->mm->mutex);
+        mutex_unlock(&vm->mm.mutex);
         ret = nouveau_gpuobj_new(vm->dev, NULL, pgt_size, 0x1000,
                                  NVOBJ_FLAG_ZERO_ALLOC, &pgt);
-        mutex_lock(&vm->mm->mutex);
+        mutex_lock(&vm->mm.mutex);
         if (unlikely(ret))
                 return ret;
 
         /* someone beat us to filling the PDE while we didn't have the lock */
         if (unlikely(vpgt->refcount[big]++)) {
-                mutex_unlock(&vm->mm->mutex);
+                mutex_unlock(&vm->mm.mutex);
                 nouveau_gpuobj_ref(NULL, &pgt);
-                mutex_lock(&vm->mm->mutex);
+                mutex_lock(&vm->mm.mutex);
                 return 0;
         }
 
@@ -223,10 +223,10 @@ nouveau_vm_get(struct nouveau_vm *vm, u64 size, u32 page_shift,
         u32 fpde, lpde, pde;
         int ret;
 
-        mutex_lock(&vm->mm->mutex);
-        ret = nouveau_mm_get(vm->mm, page_shift, msize, 0, align, &vma->node);
+        mutex_lock(&vm->mm.mutex);
+        ret = nouveau_mm_get(&vm->mm, page_shift, msize, 0, align, &vma->node);
         if (unlikely(ret != 0)) {
-                mutex_unlock(&vm->mm->mutex);
+                mutex_unlock(&vm->mm.mutex);
                 return ret;
         }
 
@@ -245,13 +245,13 @@ nouveau_vm_get(struct nouveau_vm *vm, u64 size, u32 page_shift,
                 if (ret) {
                         if (pde != fpde)
                                 nouveau_vm_unmap_pgt(vm, big, fpde, pde - 1);
-                        nouveau_mm_put(vm->mm, vma->node);
-                        mutex_unlock(&vm->mm->mutex);
+                        nouveau_mm_put(&vm->mm, vma->node);
+                        mutex_unlock(&vm->mm.mutex);
                         vma->node = NULL;
                         return ret;
                 }
         }
-        mutex_unlock(&vm->mm->mutex);
+        mutex_unlock(&vm->mm.mutex);
 
         vma->vm     = vm;
         vma->offset = (u64)vma->node->offset << 12;
@@ -270,11 +270,11 @@ nouveau_vm_put(struct nouveau_vma *vma)
         fpde = (vma->node->offset >> vm->pgt_bits);
         lpde = (vma->node->offset + vma->node->length - 1) >> vm->pgt_bits;
 
-        mutex_lock(&vm->mm->mutex);
+        mutex_lock(&vm->mm.mutex);
         nouveau_vm_unmap_pgt(vm, vma->node->type != vm->spg_shift, fpde, lpde);
-        nouveau_mm_put(vm->mm, vma->node);
+        nouveau_mm_put(&vm->mm, vma->node);
         vma->node = NULL;
-        mutex_unlock(&vm->mm->mutex);
+        mutex_unlock(&vm->mm.mutex);
 }
 
 int
@@ -306,7 +306,7 @@ nouveau_vm_new(struct drm_device *dev, u64 offset, u64 length, u64 mm_offset,
                         block = length;
 
         } else
-        if (dev_priv->card_type == NV_C0) {
+        if (dev_priv->card_type >= NV_C0) {
                 vm->map_pgt = nvc0_vm_map_pgt;
                 vm->map = nvc0_vm_map;
                 vm->map_sg = nvc0_vm_map_sg;
@@ -360,11 +360,11 @@ nouveau_vm_link(struct nouveau_vm *vm, struct nouveau_gpuobj *pgd)
 
         nouveau_gpuobj_ref(pgd, &vpgd->obj);
 
-        mutex_lock(&vm->mm->mutex);
+        mutex_lock(&vm->mm.mutex);
         for (i = vm->fpde; i <= vm->lpde; i++)
                 vm->map_pgt(pgd, i, vm->pgt[i - vm->fpde].obj);
         list_add(&vpgd->head, &vm->pgd_list);
-        mutex_unlock(&vm->mm->mutex);
+        mutex_unlock(&vm->mm.mutex);
         return 0;
 }
 
@@ -377,7 +377,7 @@ nouveau_vm_unlink(struct nouveau_vm *vm, struct nouveau_gpuobj *mpgd)
         if (!mpgd)
                 return;
 
-        mutex_lock(&vm->mm->mutex);
+        mutex_lock(&vm->mm.mutex);
         list_for_each_entry_safe(vpgd, tmp, &vm->pgd_list, head) {
                 if (vpgd->obj == mpgd) {
                         pgd = vpgd->obj;
@@ -386,7 +386,7 @@ nouveau_vm_unlink(struct nouveau_vm *vm, struct nouveau_gpuobj *mpgd)
                         break;
                 }
         }
-        mutex_unlock(&vm->mm->mutex);
+        mutex_unlock(&vm->mm.mutex);
 
         nouveau_gpuobj_ref(NULL, &pgd);
 }