diff options
| author | Alex Waterman <alexw@nvidia.com> | 2014-06-23 21:06:00 -0400 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:22 -0400 |
| commit | aa1c834b69ce13b2e0a6dd2df6189ad119ffd94b (patch) | |
| tree | 2587d18db96a113b9c8390f3f7681597d99a4bb5 /include/linux | |
| parent | f236d641a2009471e18d8419958140d23fc2de9d (diff) | |
video: tegra: nvmap: move nvmap to DT
This patch migrates nvmap to the device tree. The legacy path
is retained; i.e the path that loads the VPR sizes from the
kernel's command line arguments.
This patch also renames the nvmap device and driver to
'nvmap-carveouts'. This works better with the device tree
nomenclature.
Bug 200008319
Change-Id: I2929095c7f2af0ba188a371eebd4bf7293ca8b0e
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/427810
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvmap.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/nvmap.h b/include/linux/nvmap.h index cb889f110..566868147 100644 --- a/include/linux/nvmap.h +++ b/include/linux/nvmap.h | |||
| @@ -68,16 +68,6 @@ struct dma_buf *nvmap_alloc_dmabuf(size_t size, size_t align, | |||
| 68 | 68 | ||
| 69 | 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); |
| 70 | 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 | |||
| 81 | #ifdef CONFIG_NVMAP_PAGE_POOLS | 71 | #ifdef CONFIG_NVMAP_PAGE_POOLS |
| 82 | ulong nvmap_page_pool_get_unused_pages(void); | 72 | ulong nvmap_page_pool_get_unused_pages(void); |
| 83 | ulong nvmap_page_pool_get_pool_size(void); | 73 | ulong nvmap_page_pool_get_pool_size(void); |
