drm/nouveau/mmu: remove old vmm frontend

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

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h
index d8d63ae7e0f751f915acb002bcce306b29095676..d024d8055fcb175af5e55451e289f6c556f545d7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/priv.h
@@ -11,9 +11,19 @@ int nvkm_mmu_new_(const struct nvkm_mmu_func *, struct nvkm_device *,
 struct nvkm_mmu_func {
        void (*init)(struct nvkm_mmu *);
 
-       u64 limit;
        u8  dma_bits;
-       u8  lpg_shift;
+
+       struct {
+               struct nvkm_sclass user;
+       } mmu;
+
+       struct {
+               struct nvkm_sclass user;
+               int (*vram)(struct nvkm_mmu *, int type, u8 page, u64 size,
+                           void *argv, u32 argc, struct nvkm_memory **);
+               int (*umap)(struct nvkm_mmu *, struct nvkm_memory *, void *argv,
+                           u32 argc, u64 *addr, u64 *size, struct nvkm_vma **);
+       } mem;
 
        struct {
                struct nvkm_sclass user;