diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2012-03-15 19:14:53 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-03-20 14:02:25 -0700 |
| commit | bda291df6347efb06cf15de0bbc09ce18ef757bb (patch) | |
| tree | ae860081309806a48c5a3c933464b3dee040a9ba /drivers/video/tegra/nvmap | |
| parent | 419f21cd5826a38a1759fde2a4daba92a4f9a7bc (diff) | |
arm: tegra: nvmap: Update nvmap_alloc api.
Update nvmap_alloc api to take heap_mask as arg.
This is to let clients specify the specific heap needed.
Change-Id: I9950b3e60e6dac0301b6dc66be3e9d0bab8e0fee
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/90471
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/video/tegra/nvmap')
| -rw-r--r-- | drivers/video/tegra/nvmap/nvmap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap.c b/drivers/video/tegra/nvmap/nvmap.c index 5fcdee61b71c..b4b6241618db 100644 --- a/drivers/video/tegra/nvmap/nvmap.c +++ b/drivers/video/tegra/nvmap/nvmap.c @@ -740,19 +740,23 @@ void nvmap_munmap(struct nvmap_handle_ref *ref, void *addr) } struct nvmap_handle_ref *nvmap_alloc(struct nvmap_client *client, size_t size, - size_t align, unsigned int flags) + size_t align, unsigned int flags, + unsigned int heap_mask) { const unsigned int default_heap = (NVMAP_HEAP_SYSMEM | NVMAP_HEAP_CARVEOUT_GENERIC); struct nvmap_handle_ref *r = NULL; int err; + if (heap_mask == 0) + heap_mask = default_heap; + r = nvmap_create_handle(client, size); if (IS_ERR(r)) return r; err = nvmap_alloc_handle_id(client, nvmap_ref_to_id(r), - default_heap, align, flags); + heap_mask, align, flags); if (err) { nvmap_free_handle_id(client, nvmap_ref_to_id(r)); |