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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2017-11-01 03:56:19 +10:00
parent f66c57d922
commit 6f4dc18c16

View File

@ -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