Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / drivers / gpu / drm / nouveau / nvkm / subdev / bar / gf100.h

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
index 9accd7923788f6a61d194ecf73fcf9cb2d4777a6..4f2b66e8d7950d94c27f6b928b3a3aa43f5869b6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
@@ -4,22 +4,24 @@
 #define gf100_bar(p) container_of((p), struct gf100_bar, base)
 #include "priv.h"
 
-struct gf100_bar_vm {
-       struct nvkm_memory *mem;
-       struct nvkm_gpuobj *pgd;
-       struct nvkm_vm *vm;
+struct gf100_barN {
+       struct nvkm_memory *inst;
+       struct nvkm_vmm *vmm;
 };
 
 struct gf100_bar {
        struct nvkm_bar base;
        bool bar2_halve;
-       struct gf100_bar_vm bar[2];
+       struct gf100_barN bar[2];
 };
 
 int gf100_bar_new_(const struct nvkm_bar_func *, struct nvkm_device *,
                   int, struct nvkm_bar **);
 void *gf100_bar_dtor(struct nvkm_bar *);
 int gf100_bar_oneinit(struct nvkm_bar *);
-int gf100_bar_init(struct nvkm_bar *);
-int gf100_bar_umap(struct nvkm_bar *, u64, int, struct nvkm_vma *);
+void gf100_bar_bar1_init(struct nvkm_bar *);
+void gf100_bar_bar1_wait(struct nvkm_bar *);
+struct nvkm_vmm *gf100_bar_bar1_vmm(struct nvkm_bar *);
+void gf100_bar_bar2_init(struct nvkm_bar *);
+struct nvkm_vmm *gf100_bar_bar2_vmm(struct nvkm_bar *);
 #endif