leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.c
View File

@@ -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_vma *vma, void *argv, u32 argc)
{ {
struct nvkm_vram *vram = nvkm_vram(memory); 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 = { struct nvkm_mem mem = {
.mem = vram->mn, .mem = vram->mn,
.memory = &vram->memory, .memory = &vram->memory,
@@ -47,6 +54,9 @@ nvkm_vram_map(struct nvkm_memory *memory, u64 offset, struct nvkm_vmm *vmm,
return 0; return 0;
} }
return nvkm_vmm_map(vmm, vma, argv, argc, &map);
}
static u64 static u64
nvkm_vram_size(struct nvkm_memory *memory) nvkm_vram_size(struct nvkm_memory *memory)
{ {