nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 02:52:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Per-alloc alignment

Browse Source 
Change-Id: I8b7e86afb68adf6dd33b05995d0978f42d57e7b7
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/554185
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Terje Bergstrom
2014-10-07 15:02:35 +03:00
committed by Dan Willemsen
parent c0668f05ea
commit 1d9fba8804
9 changed files with 60 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/nvgpu/gk20a/gk20a_allocator.c
View File

@@ -20,7 +20,7 @@
/* init allocator struct */
int gk20a_allocator_init(struct gk20a_allocator *allocator,
const char *name, u32 start, u32 len, u32 align)
const char *name, u32 start, u32 len)
{
memset(allocator, 0, sizeof(struct gk20a_allocator));
@@ -28,16 +28,14 @@ int gk20a_allocator_init(struct gk20a_allocator *allocator,
allocator->base = start;
allocator->limit = start + len - 1;
allocator->align = align;
allocator->bitmap = kzalloc(BITS_TO_LONGS(len) * sizeof(long),
GFP_KERNEL);
if (!allocator->bitmap)
return -ENOMEM;
allocator_dbg(allocator, "%s : base %d, limit %d, align %d",
allocator->name, allocator->base,
allocator->limit, allocator->align);
allocator_dbg(allocator, "%s : base %d, limit %d",
allocator->name, allocator->base);
init_rwsem(&allocator->rw_sema);
@@ -65,7 +63,7 @@ void gk20a_allocator_destroy(struct gk20a_allocator *allocator)
* contiguous address.
*/
int gk20a_allocator_block_alloc(struct gk20a_allocator *allocator,
u32 *addr, u32 len)
u32 *addr, u32 len, u32 align)
{
unsigned long _addr;
@@ -73,11 +71,11 @@ int gk20a_allocator_block_alloc(struct gk20a_allocator *allocator,
if ((*addr != 0 && *addr < allocator->base) || /* check addr range */
*addr + len > allocator->limit || /* check addr range */
*addr & (allocator->align - 1) || /* check addr alignment */
*addr & (align - 1) || /* check addr alignment */
len == 0) /* check len */
return -EINVAL;
len = ALIGN(len, allocator->align);
len = ALIGN(len, align);
if (!len)
return -ENOMEM;
@@ -87,7 +85,7 @@ int gk20a_allocator_block_alloc(struct gk20a_allocator *allocator,
allocator->limit - allocator->base + 1,
*addr ? (*addr - allocator->base) : 0,
len,
allocator->align - 1);
align - 1);
if ((_addr > allocator->limit - allocator->base + 1) ||
(*addr && *addr != (_addr + allocator->base))) {
up_write(&allocator->rw_sema);
@@ -106,16 +104,16 @@ int gk20a_allocator_block_alloc(struct gk20a_allocator *allocator,
/* free all blocks between start and end */
int gk20a_allocator_block_free(struct gk20a_allocator *allocator,
u32 addr, u32 len)
u32 addr, u32 len, u32 align)
{
allocator_dbg(allocator, "[in] addr %d, len %d", addr, len);
if (addr + len > allocator->limit || /* check addr range */
addr < allocator->base ||
addr & (allocator->align - 1)) /* check addr alignment */
addr & (align - 1)) /* check addr alignment */
return -EINVAL;
len = ALIGN(len, allocator->align);
len = ALIGN(len, align);
if (!len)
return -EINVAL;