summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/nvmap/nvmap_heap.h
diff options
context:
space:
mode:
authorKirill Artamonov <kartamonov@nvidia.com>2011-02-09 23:53:03 +0200
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:44:52 -0800
commit4e01c4c6f3399b59ae263b434c43e5c366cf1d35 (patch)
treee4c026ba581aae521fb525de980ff5ce770e8ef9 /drivers/video/tegra/nvmap/nvmap_heap.h
parentcc519518d2cc078bf52dc0725d325332c7af862d (diff)
nvmap: implementing K36 carveout compactor
bug 762482 Original-Change-Id: Ifadebc1b0c4eb0df89e179091acca0ff6e527e56 Reviewed-on: http://git-master/r/15743 Reviewed-by: Kirill Artamonov <kartamonov@nvidia.com> Tested-by: Kirill Artamonov <kartamonov@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: R639e7f09f44c8919bd57a16a577b87db91160555
Diffstat (limited to 'drivers/video/tegra/nvmap/nvmap_heap.h')
-rw-r--r--drivers/video/tegra/nvmap/nvmap_heap.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_heap.h b/drivers/video/tegra/nvmap/nvmap_heap.h
index 40ee4ba02cb2..39539762175b 100644
--- a/drivers/video/tegra/nvmap/nvmap_heap.h
+++ b/drivers/video/tegra/nvmap/nvmap_heap.h
@@ -30,6 +30,7 @@ struct attribute_group;
struct nvmap_heap_block {
unsigned long base;
unsigned int type;
+ struct nvmap_handle *handle;
};
#define NVMAP_HEAP_MIN_BUDDY_SIZE 8192
@@ -45,7 +46,8 @@ void *nvmap_heap_device_to_arg(struct device *dev);
void *nvmap_heap_to_arg(struct nvmap_heap *heap);
struct nvmap_heap_block *nvmap_heap_alloc(struct nvmap_heap *heap, size_t len,
- size_t align, unsigned int prot);
+ size_t align, unsigned int prot,
+ struct nvmap_handle *handle);
struct nvmap_heap *nvmap_block_to_heap(struct nvmap_heap_block *b);