drm/nouveau/mmu/gf100-: type-based vram allocation and bar mapping

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / nouveau / nvkm / subdev / mmu / gf100.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c
index 24e2d933524d39484416c378152032a644980e61..e054c01d00b8b7aac9c93c3ca974f35e6c0b4538 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c
@@ -21,6 +21,7 @@
  *
  * Authors: Ben Skeggs
  */
+#include "mem.h"
 #include "vmm.h"
 
 #include <nvif/class.h>
@@ -75,11 +76,11 @@ static const struct nvkm_mmu_func
 gf100_mmu = {
        .limit = (1ULL << 40),
        .dma_bits = 40,
-       .pgt_bits  = 27 - 12,
-       .spg_shift = 12,
        .lpg_shift = 17,
+       .mem = {{ -1,  0, NVIF_CLASS_MEM_GF100}, gf100_mem_new, gf100_mem_map },
        .vmm = {{ -1, -1, NVIF_CLASS_VMM_GF100}, gf100_vmm_new },
        .kind = gf100_mmu_kind,
+       .kind_sys = true,
 };
 
 int