diff options
| author | Alex Waterman <alexw@nvidia.com> | 2014-06-10 14:17:50 -0400 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:12 -0400 |
| commit | e32b084701f160be0b6d558d9cbdd8bd3a86a8bc (patch) | |
| tree | c8042e913d888b2652e9043feaac16f0122e6b57 /include/linux | |
| parent | 4c4691157681bd3552c7e2b7d6c0a63d62059aed (diff) | |
video: tegra: nvmap: Move nvmap init code
Move the nvmap init code to nvmap's directory and remove
the board code. This is in preparation for using the device
tree to specify the carveout structures that nvmap ends up
creating.
Bug 200008319
Change-Id: Ia593714f2fd4cc1c7143df0b3c931cf01e0d611f
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/421887
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvmap.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/linux/nvmap.h b/include/linux/nvmap.h index 3bfb365b2..cb889f110 100644 --- a/include/linux/nvmap.h +++ b/include/linux/nvmap.h | |||
| @@ -58,12 +58,26 @@ | |||
| 58 | 58 | ||
| 59 | #if defined(__KERNEL__) | 59 | #if defined(__KERNEL__) |
| 60 | 60 | ||
| 61 | struct platform_device; | ||
| 62 | |||
| 63 | struct platform_device *nvmap_get_platform_dev(void); | ||
| 64 | |||
| 61 | struct dma_buf *nvmap_alloc_dmabuf(size_t size, size_t align, | 65 | struct dma_buf *nvmap_alloc_dmabuf(size_t size, size_t align, |
| 62 | unsigned int flags, | 66 | unsigned int flags, |
| 63 | unsigned int heap_mask); | 67 | unsigned int heap_mask); |
| 64 | 68 | ||
| 65 | int nvmap_get_dmabuf_param(struct dma_buf *dmabuf, u32 param, u64 *result); | 69 | int nvmap_get_dmabuf_param(struct dma_buf *dmabuf, u32 param, u64 *result); |
| 66 | 70 | ||
| 71 | #ifdef CONFIG_TEGRA_NVMAP | ||
| 72 | int __init nvmap_init(void); | ||
| 73 | #else | ||
| 74 | /* MODS does not enable nvmap. */ | ||
| 75 | __attribute__((unused)) static int nvmap_init(void) | ||
| 76 | { | ||
| 77 | return 0; | ||
| 78 | } | ||
| 79 | #endif | ||
| 80 | |||
| 67 | #ifdef CONFIG_NVMAP_PAGE_POOLS | 81 | #ifdef CONFIG_NVMAP_PAGE_POOLS |
| 68 | ulong nvmap_page_pool_get_unused_pages(void); | 82 | ulong nvmap_page_pool_get_unused_pages(void); |
| 69 | ulong nvmap_page_pool_get_pool_size(void); | 83 | ulong nvmap_page_pool_get_pool_size(void); |
