From c49160127acfa5a9f550ecfa2d61c054060dbab3 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Thu, 17 Aug 2017 18:38:32 -0700 Subject: gpu: nvgpu: remove unused tracing from allocators Remove an unused tracing feature from the allocator code. This should make multi-OS support slightly easier. Change-Id: I8b57f037b66227f2110e457bff7aa6b443d89e82 Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1544438 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker Reviewed-by: svc-mobile-coverity Reviewed-by: Konsta Holtta GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/common/linux/debug_allocator.c | 5 ----- drivers/gpu/nvgpu/common/mm/buddy_allocator.c | 15 +-------------- 2 files changed, 1 insertion(+), 19 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/debug_allocator.c b/drivers/gpu/nvgpu/common/linux/debug_allocator.c index 6a0aa4c5..766c8486 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_allocator.c +++ b/drivers/gpu/nvgpu/common/linux/debug_allocator.c @@ -20,8 +20,6 @@ #include -u32 nvgpu_alloc_tracing_on; - void nvgpu_alloc_print_stats(struct nvgpu_allocator *__a, struct seq_file *s, int lock) { @@ -76,7 +74,4 @@ void nvgpu_alloc_debugfs_init(struct gk20a *g) l->debugfs_allocators = NULL; return; } - - debugfs_create_u32("tracing", 0664, l->debugfs_allocators, - &nvgpu_alloc_tracing_on); } diff --git a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c index 3e305bb8..a2e6c44a 100644 --- a/drivers/gpu/nvgpu/common/mm/buddy_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/buddy_allocator.c @@ -785,8 +785,6 @@ static u64 nvgpu_buddy_balloc(struct nvgpu_allocator *__a, u64 len) int pte_size; struct nvgpu_buddy_allocator *a = __a->priv; - nvgpu_alloc_trace_func(); - alloc_lock(__a); order = balloc_get_order(a, len); @@ -794,7 +792,6 @@ static u64 nvgpu_buddy_balloc(struct nvgpu_allocator *__a, u64 len) if (order > a->max_order) { alloc_unlock(__a); alloc_dbg(balloc_owner(a), "Alloc fail\n"); - nvgpu_alloc_trace_func_done(); return 0; } @@ -822,7 +819,6 @@ static u64 nvgpu_buddy_balloc(struct nvgpu_allocator *__a, u64 len) alloc_unlock(__a); - nvgpu_alloc_trace_func_done(); return addr; } @@ -838,8 +834,6 @@ static u64 __nvgpu_balloc_fixed_buddy(struct nvgpu_allocator *__a, struct nvgpu_fixed_alloc *falloc = NULL; struct nvgpu_buddy_allocator *a = __a->priv; - nvgpu_alloc_trace_func(); - /* If base isn't aligned to an order 0 block, fail. */ if (base & (a->blk_size - 1)) goto fail; @@ -890,14 +884,12 @@ static u64 __nvgpu_balloc_fixed_buddy(struct nvgpu_allocator *__a, alloc_dbg(balloc_owner(a), "Alloc (fixed) 0x%llx\n", base); - nvgpu_alloc_trace_func_done(); return base; fail_unlock: alloc_unlock(__a); fail: nvgpu_kfree(nvgpu_alloc_to_gpu(__a), falloc); - nvgpu_alloc_trace_func_done(); return 0; } @@ -932,12 +924,8 @@ static void nvgpu_buddy_bfree(struct nvgpu_allocator *__a, u64 addr) struct nvgpu_fixed_alloc *falloc; struct nvgpu_buddy_allocator *a = __a->priv; - nvgpu_alloc_trace_func(); - - if (!addr) { - nvgpu_alloc_trace_func_done(); + if (!addr) return; - } alloc_lock(__a); @@ -966,7 +954,6 @@ static void nvgpu_buddy_bfree(struct nvgpu_allocator *__a, u64 addr) done: alloc_unlock(__a); alloc_dbg(balloc_owner(a), "Free 0x%llx\n", addr); - nvgpu_alloc_trace_func_done(); return; } -- cgit v1.2.2