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

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent f66c57d9

drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c

+14 −4
Original line number Diff line number Diff line
@@ -39,6 +39,13 @@ 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_vmm_map map = {

		.memory = &vram->memory,

		.offset = offset,

		.mem = vram->mn,

	};



	if (vma->vm) {

		struct nvkm_mem mem = {

			.mem = vram->mn,

			.memory = &vram->memory,
@@ -47,6 +54,9 @@ nvkm_vram_map(struct nvkm_memory *memory, u64 offset, struct nvkm_vmm *vmm, 
		return 0;

	}



	return nvkm_vmm_map(vmm, vma, argv, argc, &map);

}



static u64

nvkm_vram_size(struct nvkm_memory *memory)

{