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/media | |
| 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/media')
| -rw-r--r-- | drivers/media/video/tegra/avp/avp.c | 6 | ||||
| -rw-r--r-- | drivers/media/video/tegra/nvavp/nvavp_dev.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/tegra/avp/avp.c b/drivers/media/video/tegra/avp/avp.c index b2870730b31c..074a42f125be 100644 --- a/drivers/media/video/tegra/avp/avp.c +++ b/drivers/media/video/tegra/avp/avp.c @@ -1158,7 +1158,7 @@ static int _load_lib(struct tegra_avp_info *avp, struct tegra_avp_lib *lib, } lib_handle = nvmap_alloc(avp->nvmap_libs, fw->size, L1_CACHE_BYTES, - NVMAP_HANDLE_UNCACHEABLE); + NVMAP_HANDLE_UNCACHEABLE, 0); if (IS_ERR_OR_NULL(lib_handle)) { pr_err("avp_lib: can't nvmap alloc for lib '%s'\n", lib->name); ret = PTR_ERR(lib_handle); @@ -1649,7 +1649,7 @@ static int tegra_avp_probe(struct platform_device *pdev) if (heap_mask == NVMAP_HEAP_CARVEOUT_GENERIC) { avp->kernel_handle = nvmap_alloc(avp->nvmap_drv, SZ_1M, SZ_1M, - NVMAP_HANDLE_UNCACHEABLE); + NVMAP_HANDLE_UNCACHEABLE, 0); if (IS_ERR_OR_NULL(avp->kernel_handle)) { pr_err("%s: cannot create handle\n", __func__); ret = PTR_ERR(avp->kernel_handle); @@ -1680,7 +1680,7 @@ static int tegra_avp_probe(struct platform_device *pdev) */ avp->iram_backup_handle = nvmap_alloc(avp->nvmap_drv, TEGRA_IRAM_SIZE + 4, - L1_CACHE_BYTES, NVMAP_HANDLE_UNCACHEABLE); + L1_CACHE_BYTES, NVMAP_HANDLE_UNCACHEABLE, 0); if (IS_ERR_OR_NULL(avp->iram_backup_handle)) { pr_err("%s: cannot create handle for iram backup\n", __func__); ret = PTR_ERR(avp->iram_backup_handle); diff --git a/drivers/media/video/tegra/nvavp/nvavp_dev.c b/drivers/media/video/tegra/nvavp/nvavp_dev.c index 0490bfcc5855..63ddcdee3b28 100644 --- a/drivers/media/video/tegra/nvavp/nvavp_dev.c +++ b/drivers/media/video/tegra/nvavp/nvavp_dev.c @@ -328,7 +328,7 @@ static int nvavp_pushbuffer_alloc(struct nvavp_info *nvavp) int ret = 0; nvavp->pushbuf_handle = nvmap_alloc(nvavp->nvmap, NVAVP_PUSHBUFFER_SIZE, - SZ_1M, NVMAP_HANDLE_UNCACHEABLE); + SZ_1M, NVMAP_HANDLE_UNCACHEABLE, 0); if (IS_ERR(nvavp->pushbuf_handle)) { dev_err(&nvavp->nvhost_dev->dev, "cannot create pushbuffer handle\n"); @@ -571,7 +571,7 @@ static int nvavp_load_ucode(struct nvavp_info *nvavp) ucode_info->handle = nvmap_alloc(nvavp->nvmap, nvavp->ucode_info.size, - SZ_1M, NVMAP_HANDLE_UNCACHEABLE); + SZ_1M, NVMAP_HANDLE_UNCACHEABLE, 0); if (IS_ERR(ucode_info->handle)) { dev_err(&nvavp->nvhost_dev->dev, "cannot create ucode handle\n"); @@ -1205,7 +1205,7 @@ static int tegra_nvavp_probe(struct nvhost_device *ndev) break; case NVMAP_HEAP_CARVEOUT_GENERIC: nvavp->os_info.handle = nvmap_alloc(nvavp->nvmap, SZ_1M, SZ_1M, - NVMAP_HANDLE_UNCACHEABLE); + NVMAP_HANDLE_UNCACHEABLE, 0); if (IS_ERR_OR_NULL(nvavp->os_info.handle)) { dev_err(&ndev->dev, "cannot create AVP os handle\n"); ret = PTR_ERR(nvavp->os_info.handle); |