drm/nouveau/fb/ram: remove old allocators

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
index 9242248a8e88cc6af7fc60b2e1eeea3495e62d42..e1776506746b21101f83ee4541a1b7cc7a2b0c82 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
@@ -162,10 +162,6 @@ struct nvkm_ram_func {
        void *(*dtor)(struct nvkm_ram *);
        int (*init)(struct nvkm_ram *);
 
-       int (*get)(struct nvkm_ram *, u64 size, u32 align, u32 size_nc,
-                  u32 type, struct nvkm_mem **);
-       void (*put)(struct nvkm_ram *, struct nvkm_mem **);
-
        int (*calc)(struct nvkm_ram *, u32 freq);
        int (*prog)(struct nvkm_ram *);
        void (*tidy)(struct nvkm_ram *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
index a007699b60a2dc8cd32a43e4737ac270e9ffe912..70fd59dcd06d6715fc565d94a330aceec308c501 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
@@ -13,9 +13,6 @@ extern const struct nvkm_ram_func nv04_ram_func;
 
 int  nv50_ram_ctor(const struct nvkm_ram_func *, struct nvkm_fb *,
                   struct nvkm_ram *);
-int  nv50_ram_get(struct nvkm_ram *, u64, u32, u32, u32, struct nvkm_mem **);
-void nv50_ram_put(struct nvkm_ram *, struct nvkm_mem **);
-void __nv50_ram_put(struct nvkm_ram *, struct nvkm_mem *);
 
 int gf100_ram_new_(const struct nvkm_ram_func *, struct nvkm_fb *,
                   struct nvkm_ram **);
@@ -26,8 +23,6 @@ u32  gf100_ram_probe_fbp(const struct nvkm_ram_func *,
 u32  gf100_ram_probe_fbp_amount(const struct nvkm_ram_func *, u32,
                                struct nvkm_device *, int, int *);
 u32  gf100_ram_probe_fbpa_amount(struct nvkm_device *, int);
-int  gf100_ram_get(struct nvkm_ram *, u64, u32, u32, u32, struct nvkm_mem **);
-void gf100_ram_put(struct nvkm_ram *, struct nvkm_mem **);
 int gf100_ram_init(struct nvkm_ram *);
 int gf100_ram_calc(struct nvkm_ram *, u32);
 int gf100_ram_prog(struct nvkm_ram *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
index f0bbbbd18cbd63c862cf6d3eac8f7fe6c38f1d1b..ac87a3b6b7c9e4de1c837c5e03ab2a472d0a9945 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c
@@ -419,71 +419,6 @@ gf100_ram_tidy(struct nvkm_ram *base)
        ram_exec(&ram->fuc, false);
 }
 
-void
-gf100_ram_put(struct nvkm_ram *ram, struct nvkm_mem **pmem)
-{
-       struct nvkm_mem *mem = *pmem;
-
-       *pmem = NULL;
-       if (unlikely(mem == NULL))
-               return;
-
-       mutex_lock(&ram->fb->subdev.mutex);
-       __nv50_ram_put(ram, mem);
-       mutex_unlock(&ram->fb->subdev.mutex);
-
-       kfree(mem);
-}
-
-int
-gf100_ram_get(struct nvkm_ram *ram, u64 size, u32 align, u32 ncmin,
-             u32 memtype, struct nvkm_mem **pmem)
-{
-       struct nvkm_mm *mm = &ram->vram;
-       struct nvkm_mm_node **node, *r;
-       struct nvkm_mem *mem;
-       int type = (memtype & 0x0ff);
-       int back = (memtype & 0x800);
-       int ret;
-
-       size  >>= NVKM_RAM_MM_SHIFT;
-       align >>= NVKM_RAM_MM_SHIFT;
-       ncmin >>= NVKM_RAM_MM_SHIFT;
-       if (!ncmin)
-               ncmin = size;
-
-       mem = kzalloc(sizeof(*mem), GFP_KERNEL);
-       if (!mem)
-               return -ENOMEM;
-
-       mem->size = size;
-
-       mutex_lock(&ram->fb->subdev.mutex);
-       mem->memtype = type;
-
-       node = &mem->mem;
-       do {
-               if (back)
-                       ret = nvkm_mm_tail(mm, 0, 1, size, ncmin, align, &r);
-               else
-                       ret = nvkm_mm_head(mm, 0, 1, size, ncmin, align, &r);
-               if (ret) {
-                       mutex_unlock(&ram->fb->subdev.mutex);
-                       ram->func->put(ram, &mem);
-                       return ret;
-               }
-
-               *node = r;
-               node = &r->next;
-               size -= r->length;
-       } while (size);
-       mutex_unlock(&ram->fb->subdev.mutex);
-
-       mem->offset = (u64)mem->mem->offset << NVKM_RAM_MM_SHIFT;
-       *pmem = mem;
-       return 0;
-}
-
 int
 gf100_ram_init(struct nvkm_ram *base)
 {
@@ -725,8 +660,6 @@ gf100_ram = {
        .probe_fbp_amount = gf100_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
        .init = gf100_ram_init,
-       .get = gf100_ram_get,
-       .put = gf100_ram_put,
        .calc = gf100_ram_calc,
        .prog = gf100_ram_prog,
        .tidy = gf100_ram_tidy,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c
index 985ec64cf369bc7258a9d1e310ddba3b78e3e490..70a06e3cd55a2b4f1326589eb4f39774feacf858 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c
@@ -48,8 +48,6 @@ gf108_ram = {
        .probe_fbp_amount = gf108_ram_probe_fbp_amount,
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
        .init = gf100_ram_init,
-       .get = gf100_ram_get,
-       .put = gf100_ram_put,
        .calc = gf100_ram_calc,
        .prog = gf100_ram_prog,
        .tidy = gf100_ram_tidy,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
index 75814f15eb53cc2cf148234d97d1b9d482c1e00f..8bcb7e79a0cb5e2ea70a53757d3087af40803e90 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
@@ -1704,8 +1704,6 @@ gk104_ram = {
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
        .dtor = gk104_ram_dtor,
        .init = gk104_ram_init,
-       .get = gf100_ram_get,
-       .put = gf100_ram_put,
        .calc = gk104_ram_calc,
        .prog = gk104_ram_prog,
        .tidy = gk104_ram_tidy,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c
index 3f0b56347291bf433327c4541e2f443d5dc3cb8c..27c68e3f977211bf393799894f81912541e7297c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c
@@ -39,8 +39,6 @@ gm107_ram = {
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
        .dtor = gk104_ram_dtor,
        .init = gk104_ram_init,
-       .get = gf100_ram_get,
-       .put = gf100_ram_put,
        .calc = gk104_ram_calc,
        .prog = gk104_ram_prog,
        .tidy = gk104_ram_tidy,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c
index fd8facf904766bf30eb4eb07dac4278c44a5f192..6b0cac1fe7b441bf0fdb23c24e3783681f4372ce 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c
@@ -54,8 +54,6 @@ gm200_ram = {
        .probe_fbpa_amount = gf100_ram_probe_fbpa_amount,
        .dtor = gk104_ram_dtor,
        .init = gk104_ram_init,
-       .get = gf100_ram_get,
-       .put = gf100_ram_put,
        .calc = gk104_ram_calc,
        .prog = gk104_ram_prog,
        .tidy = gk104_ram_tidy,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
index df8a87333b6743bf2612e5cfd026ca8109b71c46..adb62a6beb638a580ce8fa29db9260282c79a92d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
@@ -84,8 +84,6 @@ gp100_ram = {
        .probe_fbp_amount = gm200_ram_probe_fbp_amount,
        .probe_fbpa_amount = gp100_ram_probe_fbpa,
        .init = gp100_ram_init,
-       .get = gf100_ram_get,
-       .put = gf100_ram_put,
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
index 9bace6c4ad0bbf96d813c2a6959277c17cf02ba3..920b3d3478030653cfaf775de433ea1e2cd35552 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c
@@ -931,8 +931,6 @@ static const struct nvkm_ram_func
 gt215_ram_func = {
        .dtor = gt215_ram_dtor,
        .init = gt215_ram_init,
-       .get = nv50_ram_get,
-       .put = nv50_ram_put,
        .calc = gt215_ram_calc,
        .prog = gt215_ram_prog,
        .tidy = gt215_ram_tidy,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
index 76fa71f0c4576884c647e414923a60a2b08790c3..7de18e53ef45cafe39d2c578efbb30da491f3ad7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c
@@ -53,8 +53,6 @@ mcp77_ram_init(struct nvkm_ram *base)
 static const struct nvkm_ram_func
 mcp77_ram_func = {
        .init = mcp77_ram_init,
-       .get = nv50_ram_get,
-       .put = nv50_ram_put,
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c
index 79312205b0e4544a23df663f01890698a76fe21a..2ccb4b6be153869668ea32afc7395655585a853c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c
@@ -493,85 +493,8 @@ nv50_ram_tidy(struct nvkm_ram *base)
        ram_exec(&ram->hwsq, false);
 }
 
-void
-__nv50_ram_put(struct nvkm_ram *ram, struct nvkm_mem *mem)
-{
-       struct nvkm_mm_node *next = mem->mem;
-       struct nvkm_mm_node *node;
-       while ((node = next)) {
-               next = node->next;
-               nvkm_mm_free(&ram->vram, &node);
-       }
-}
-
-void
-nv50_ram_put(struct nvkm_ram *ram, struct nvkm_mem **pmem)
-{
-       struct nvkm_mem *mem = *pmem;
-
-       *pmem = NULL;
-       if (unlikely(mem == NULL))
-               return;
-
-       mutex_lock(&ram->fb->subdev.mutex);
-       __nv50_ram_put(ram, mem);
-       mutex_unlock(&ram->fb->subdev.mutex);
-
-       kfree(mem);
-}
-
-int
-nv50_ram_get(struct nvkm_ram *ram, u64 size, u32 align, u32 ncmin,
-            u32 memtype, struct nvkm_mem **pmem)
-{
-       struct nvkm_mm *heap = &ram->vram;
-       struct nvkm_mm_node **node, *r;
-       struct nvkm_mem *mem;
-       int comp = (memtype & 0x300) >> 8;
-       int type = (memtype & 0x07f);
-       int back = (memtype & 0x800);
-       int min, max, ret;
-
-       max = (size >> NVKM_RAM_MM_SHIFT);
-       min = ncmin ? (ncmin >> NVKM_RAM_MM_SHIFT) : max;
-       align >>= NVKM_RAM_MM_SHIFT;
-
-       mem = kzalloc(sizeof(*mem), GFP_KERNEL);
-       if (!mem)
-               return -ENOMEM;
-
-       mutex_lock(&ram->fb->subdev.mutex);
-       mem->memtype = (comp << 7) | type;
-       mem->size = max;
-
-       type = nv50_fb_memtype[type];
-       node = &mem->mem;
-       do {
-               if (back)
-                       ret = nvkm_mm_tail(heap, 0, type, max, min, align, &r);
-               else
-                       ret = nvkm_mm_head(heap, 0, type, max, min, align, &r);
-               if (ret) {
-                       mutex_unlock(&ram->fb->subdev.mutex);
-                       ram->func->put(ram, &mem);
-                       return ret;
-               }
-
-               *node = r;
-               node = &r->next;
-               max -= r->length;
-       } while (max);
-       mutex_unlock(&ram->fb->subdev.mutex);
-
-       mem->offset = (u64)mem->mem->offset << NVKM_RAM_MM_SHIFT;
-       *pmem = mem;
-       return 0;
-}
-
 static const struct nvkm_ram_func
 nv50_ram_func = {
-       .get = nv50_ram_get,
-       .put = nv50_ram_put,
        .calc = nv50_ram_calc,
        .prog = nv50_ram_prog,
        .tidy = nv50_ram_tidy,