drm/nouveau/fb/ram: use new interfaces for vmm operations

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
index 03a860ae75b11be6f6c744a95447463f7c9662d8..5305078f730e731ee7b3af28644bf064ecbff06d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
@@ -39,12 +39,22 @@ nvkm_vram_map(struct nvkm_memory *memory, u64 offset, struct nvkm_vmm *vmm,
              struct nvkm_vma *vma, void *argv, u32 argc)
 {
        struct nvkm_vram *vram = nvkm_vram(memory);
-       struct nvkm_mem mem = {
-               .mem = vram->mn,
+       struct nvkm_vmm_map map = {
                .memory = &vram->memory,
+               .offset = offset,
+               .mem = vram->mn,
        };
-       nvkm_vm_map_at(vma, offset, &mem);
-       return 0;
+
+       if (vma->vm) {
+               struct nvkm_mem mem = {
+                       .mem = vram->mn,
+                       .memory = &vram->memory,
+               };
+               nvkm_vm_map_at(vma, offset, &mem);
+               return 0;
+       }
+
+       return nvkm_vmm_map(vmm, vma, argv, argc, &map);
 }
 
 static u64