Commit 6f4dc18c authored by Ben Skeggs's avatar Ben Skeggs

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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f66c57d9
...@@ -39,12 +39,22 @@ nvkm_vram_map(struct nvkm_memory *memory, u64 offset, struct nvkm_vmm *vmm, ...@@ -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_vma *vma, void *argv, u32 argc)
{ {
struct nvkm_vram *vram = nvkm_vram(memory); struct nvkm_vram *vram = nvkm_vram(memory);
struct nvkm_mem mem = { struct nvkm_vmm_map map = {
.mem = vram->mn,
.memory = &vram->memory, .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 static u64
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment