diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_allocator.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a_allocator.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h index 154f953a..69a227bd 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h | |||
@@ -31,7 +31,6 @@ struct gk20a_allocator { | |||
31 | 31 | ||
32 | u32 base; /* min value of this linear space */ | 32 | u32 base; /* min value of this linear space */ |
33 | u32 limit; /* max value = limit - 1 */ | 33 | u32 limit; /* max value = limit - 1 */ |
34 | u32 align; /* alignment size, power of 2 */ | ||
35 | 34 | ||
36 | unsigned long *bitmap; /* bitmap */ | 35 | unsigned long *bitmap; /* bitmap */ |
37 | 36 | ||
@@ -58,21 +57,21 @@ struct gk20a_allocator { | |||
58 | } constraint; | 57 | } constraint; |
59 | 58 | ||
60 | int (*alloc)(struct gk20a_allocator *allocator, | 59 | int (*alloc)(struct gk20a_allocator *allocator, |
61 | u32 *addr, u32 len); | 60 | u32 *addr, u32 len, u32 align); |
62 | int (*free)(struct gk20a_allocator *allocator, | 61 | int (*free)(struct gk20a_allocator *allocator, |
63 | u32 addr, u32 len); | 62 | u32 addr, u32 len, u32 align); |
64 | 63 | ||
65 | }; | 64 | }; |
66 | 65 | ||
67 | int gk20a_allocator_init(struct gk20a_allocator *allocator, | 66 | int gk20a_allocator_init(struct gk20a_allocator *allocator, |
68 | const char *name, u32 base, u32 size, u32 align); | 67 | const char *name, u32 base, u32 size); |
69 | void gk20a_allocator_destroy(struct gk20a_allocator *allocator); | 68 | void gk20a_allocator_destroy(struct gk20a_allocator *allocator); |
70 | 69 | ||
71 | int gk20a_allocator_block_alloc(struct gk20a_allocator *allocator, | 70 | int gk20a_allocator_block_alloc(struct gk20a_allocator *allocator, |
72 | u32 *addr, u32 len); | 71 | u32 *addr, u32 len, u32 align); |
73 | 72 | ||
74 | int gk20a_allocator_block_free(struct gk20a_allocator *allocator, | 73 | int gk20a_allocator_block_free(struct gk20a_allocator *allocator, |
75 | u32 addr, u32 len); | 74 | u32 addr, u32 len, u32 align); |
76 | 75 | ||
77 | #if defined(ALLOCATOR_DEBUG) | 76 | #if defined(ALLOCATOR_DEBUG) |
78 | 77 | ||