drm/nouveau/mmu: remove old vmm frontend

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c
index d83da5ddbc1e82cf477dca32919e43abac8f1435..8137e19d329231c89fc099fe99e45c6183eeab17 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c
@@ -26,22 +26,18 @@
 
 #include <core/memory.h>
 
-void
+int
 gm200_fb_init_page(struct nvkm_fb *fb)
 {
        struct nvkm_device *device = fb->subdev.device;
        switch (fb->page) {
-       case 16:
-               nvkm_mask(device, 0x100c80, 0x00000801, 0x00000001);
-               break;
-       case 17:
-               nvkm_mask(device, 0x100c80, 0x00000801, 0x00000000);
-               break;
+       case 16: nvkm_mask(device, 0x100c80, 0x00001801, 0x00001001); break;
+       case 17: nvkm_mask(device, 0x100c80, 0x00001801, 0x00000000); break;
+       case  0: nvkm_mask(device, 0x100c80, 0x00001800, 0x00001800); break;
        default:
-               nvkm_mask(device, 0x100c80, 0x00000800, 0x00000800);
-               fb->page = 0;
-               break;
+               return -EINVAL;
        }
+       return 0;
 }
 
 void
@@ -69,7 +65,7 @@ gm200_fb = {
        .init_page = gm200_fb_init_page,
        .intr = gf100_fb_intr,
        .ram_new = gm200_ram_new,
-       .memtype_valid = gf100_fb_memtype_valid,
+       .default_bigpage = 0 /* per-instance. */,
 };
 
 int