5 files changed, 12 insertions, 70 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c b/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c
index 40ee199a..eae0475a 100644
--- a/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/bitmap_allocator.c
@@ -411,7 +411,9 @@ int nvgpu_bitmap_allocator_init(struct gk20a *g, struct nvgpu_allocator *__a,
         wmb();
         a->inited = true;
 
+#ifdef CONFIG_DEBUG_FS
         nvgpu_init_alloc_debug(g, __a);
+#endif
         alloc_dbg(__a, "New allocator: type      bitmap\n");
         alloc_dbg(__a, "               base      0x%llx\n", a->base);
         alloc_dbg(__a, "               bit_offs  0x%llx\n", a->bit_offs);
diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
index 34bc51df..0ef94c10 100644
--- a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c
@@ -251,7 +251,9 @@ static void nvgpu_buddy_allocator_destroy(struct nvgpu_allocator *__a)
 
         alloc_lock(__a);
 
+#ifdef CONFIG_DEBUG_FS
         nvgpu_fini_alloc_debug(__a);
+#endif
 
         /*
          * Free the fixed allocs first.
@@ -1290,7 +1292,9 @@ int __nvgpu_buddy_allocator_init(struct gk20a *g, struct nvgpu_allocator *__a,
         wmb();
         a->initialized = 1;
 
+#ifdef CONFIG_DEBUG_FS
         nvgpu_init_alloc_debug(g, __a);
+#endif
         alloc_dbg(__a, "New allocator: type      buddy\n");
         alloc_dbg(__a, "               base      0x%llx\n", a->base);
         alloc_dbg(__a, "               size      0x%llx\n", a->length);
diff --git a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
index 234ae4a3..944b4b0f 100644
--- a/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/lockless_allocator.c
@@ -99,7 +99,9 @@ static void nvgpu_lockless_alloc_destroy(struct nvgpu_allocator *a)
 {
         struct nvgpu_lockless_allocator *pa = a->priv;
 
+#ifdef CONFIG_DEBUG_FS
         nvgpu_fini_alloc_debug(a);
+#endif
 
         nvgpu_vfree(a->g, pa->next);
         nvgpu_kfree(nvgpu_alloc_to_gpu(a), pa);
@@ -191,7 +193,9 @@ int nvgpu_lockless_allocator_init(struct gk20a *g, struct nvgpu_allocator *__a,
         wmb();
         a->inited = true;
 
+#ifdef CONFIG_DEBUG_FS
         nvgpu_init_alloc_debug(g, __a);
+#endif
         alloc_dbg(__a, "New allocator: type          lockless\n");
         alloc_dbg(__a, "               base          0x%llx\n", a->base);
         alloc_dbg(__a, "               nodes         %d\n", a->nr_nodes);
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
index 211b353b..1646d2b1 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c
@@ -20,11 +20,6 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
-#ifdef CONFIG_DEBUG_FS
-#include "gk20a/platform_gk20a.h"
-#endif
-
-u32 nvgpu_alloc_tracing_on;
 
 u64 nvgpu_alloc_length(struct nvgpu_allocator *a)
 {
@@ -151,68 +146,3 @@ int __nvgpu_alloc_common_init(struct nvgpu_allocator *a, struct gk20a *g,
 
         return 0;
 }
-
-#ifdef CONFIG_DEBUG_FS
-void nvgpu_alloc_print_stats(struct nvgpu_allocator *__a,
-                             struct seq_file *s, int lock)
-{
-        __a->ops->print_stats(__a, s, lock);
-}
-
-static int __alloc_show(struct seq_file *s, void *unused)
-{
-        struct nvgpu_allocator *a = s->private;
-
-        nvgpu_alloc_print_stats(a, s, 1);
-
-        return 0;
-}
-
-static int __alloc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, __alloc_show, inode->i_private);
-}
-
-static const struct file_operations __alloc_fops = {
-        .open = __alloc_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-#endif
-
-void nvgpu_init_alloc_debug(struct gk20a *g, struct nvgpu_allocator *a)
-{
-#ifdef CONFIG_DEBUG_FS
-        if (!g->debugfs_allocators)
-                return;
-
-        a->debugfs_entry = debugfs_create_file(a->name, S_IRUGO,
-                                               g->debugfs_allocators,
-                                               a, &__alloc_fops);
-#endif
-}
-
-void nvgpu_fini_alloc_debug(struct nvgpu_allocator *a)
-{
-#ifdef CONFIG_DEBUG_FS
-        if (!IS_ERR_OR_NULL(a->debugfs_entry))
-                debugfs_remove(a->debugfs_entry);
-#endif
-}
-
-#ifdef CONFIG_DEBUG_FS
-void nvgpu_alloc_debugfs_init(struct device *dev)
-{
-        struct gk20a_platform *platform = dev_get_drvdata(dev);
-        struct dentry *gpu_root = platform->debugfs;
-        struct gk20a *g = get_gk20a(dev);
-
-        g->debugfs_allocators = debugfs_create_dir("allocators", gpu_root);
-        if (IS_ERR_OR_NULL(g->debugfs_allocators))
-                return;
-
-        debugfs_create_u32("tracing", 0664, g->debugfs_allocators,
-                           &nvgpu_alloc_tracing_on);
-}
-#endif
diff --git a/drivers/gpu/nvgpu/common/mm/page_allocator.c b/drivers/gpu/nvgpu/common/mm/page_allocator.c
index 14b5da3c..3f4f3706 100644
--- a/drivers/gpu/nvgpu/common/mm/page_allocator.c
+++ b/drivers/gpu/nvgpu/common/mm/page_allocator.c
@@ -916,7 +916,9 @@ int nvgpu_page_allocator_init(struct gk20a *g, struct nvgpu_allocator *__a,
         if (err)
                 goto fail;
 
+#ifdef CONFIG_DEBUG_FS
         nvgpu_init_alloc_debug(g, __a);
+#endif
         palloc_dbg(a, "New allocator: type      page\n");
         palloc_dbg(a, "               base      0x%llx\n", a->base);
         palloc_dbg(a, "               size      0x%llx\n", a->length);