From 55295c6087ed975be12e92f9be799269aef94678 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 27 Jun 2014 14:49:36 +0300 Subject: gpu: nvgpu: Remove unused code in allocator Remove functions that are not used in gk20a allocator. Bug 1523403 Change-Id: I36b2b236258d61602cb3283b59c43b40f237d514 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/432174 --- drivers/gpu/nvgpu/gk20a/gk20a_allocator.h | 62 ------------------------------- 1 file changed, 62 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_allocator.h') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h index dba397e2..cd72ec9c 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h @@ -25,8 +25,6 @@ /* #define ALLOCATOR_DEBUG */ -struct allocator_block; - /* main struct */ struct gk20a_allocator { @@ -61,17 +59,9 @@ struct gk20a_allocator { int (*alloc)(struct gk20a_allocator *allocator, u32 *addr, u32 len); - int (*alloc_nc)(struct gk20a_allocator *allocator, - u32 *addr, u32 len, - struct gk20a_alloc_block **pblock); int (*free)(struct gk20a_allocator *allocator, u32 addr, u32 len); - void (*free_nc)(struct gk20a_allocator *allocator, - struct gk20a_alloc_block *block); - int (*constrain)(struct gk20a_allocator *a, - bool enable, - u32 base, u32 limit); }; /* a block of linear space range [start, end) */ @@ -103,14 +93,9 @@ void gk20a_allocator_destroy(struct gk20a_allocator *allocator); int gk20a_allocator_block_alloc(struct gk20a_allocator *allocator, u32 *addr, u32 len); -int gk20a_allocator_block_alloc_nc(struct gk20a_allocator *allocator, - u32 *addr, u32 len, - struct gk20a_alloc_block **pblock); int gk20a_allocator_block_free(struct gk20a_allocator *allocator, u32 addr, u32 len); -void gk20a_allocator_block_free_nc(struct gk20a_allocator *allocator, - struct gk20a_alloc_block *block); #if defined(ALLOCATOR_DEBUG) @@ -121,53 +106,6 @@ do { \ alloctor->name, __func__, ##arg);\ } while (0) -static inline void -gk20a_allocator_dump(struct gk20a_allocator *allocator) { - struct gk20a_alloc_block *block; - u32 count = 0; - - down_read(&allocator->rw_sema); - for (block = allocator->block_first; block; block = block->next) { - allocator_dbg(allocator, "block %d - %d:%d, nc %d", - count++, block->start, block->end, block->nc_block); - - if (block->prev) - BUG_ON(block->prev->end > block->start); - if (block->next) - BUG_ON(block->next->start < block->end); - } - allocator_dbg(allocator, "tracked count %d, actual count %d", - allocator->block_count, count); - allocator_dbg(allocator, "first block %d:%d", - allocator->block_first ? allocator->block_first->start : -1, - allocator->block_first ? allocator->block_first->end : -1); - allocator_dbg(allocator, "first free addr %d", - allocator->first_free_addr); - allocator_dbg(allocator, "last free addr %d", - allocator->last_free_addr); - allocator_dbg(allocator, "cached hole size %d", - allocator->cached_hole_size); - up_read(&allocator->rw_sema); - - BUG_ON(count != allocator->block_count); -} - -static inline void -gk20a_allocator_dump_nc_list( - struct gk20a_allocator *allocator, - struct gk20a_alloc_block *block) -{ - down_read(&allocator->rw_sema); - while (block) { - pr_debug("non-contiguous block %d:%d\n", - block->start, block->end); - block = block->nc_next; - } - up_read(&allocator->rw_sema); -} - -void gk20a_allocator_test(void); - #else /* ALLOCATOR_DEBUG */ #define allocator_dbg(format, arg...) -- cgit v1.2.2