diff options
| author | Kaz Fukuoka <kfukuoka@nvidia.com> | 2011-05-14 17:46:24 -0700 |
|---|---|---|
| committer | Frank Thomas Bourgeois <fbourgeois@nvidia.com> | 2011-05-15 11:05:17 -0700 |
| commit | 11f6dfc9b24ab41047ea52ca086fa8461067b098 (patch) | |
| tree | 0cd532a235085c1715f3c4a0c4942d9be4c7f2d6 | |
| parent | 34e0b9e4b6e3fa38129ae30fdc8b429e4dfe5a79 (diff) | |
media: tegra: avp: Allocate IOVMM first for AVP
bug 827505
Change-Id: If6d4fd137b72c3a08bf8fb1094d8dd31ab361f1c
Reviewed-on: http://git-master/r/31633
Reviewed-by: Kaz Fukuoka <kfukuoka@nvidia.com>
Tested-by: Kaz Fukuoka <kfukuoka@nvidia.com>
Reviewed-by: Frank Thomas Bourgeois <fbourgeois@nvidia.com>
| -rw-r--r-- | drivers/media/video/tegra/avp/avp.c | 47 | ||||
| -rw-r--r-- | drivers/video/tegra/nvmap/nvmap_dev.c | 8 |
2 files changed, 54 insertions, 1 deletions
diff --git a/drivers/media/video/tegra/avp/avp.c b/drivers/media/video/tegra/avp/avp.c index 0a90bc170887..ba90567490ef 100644 --- a/drivers/media/video/tegra/avp/avp.c +++ b/drivers/media/video/tegra/avp/avp.c @@ -1559,6 +1559,44 @@ static struct trpc_node avp_trpc_node = { .try_connect = avp_node_try_connect, }; +struct nvmap_client *avp_early_nvmap_drv; +struct nvmap_handle_ref *avp_early_kernel_handle; +void *avp_early_kernel_data; +phys_addr_t avp_early_kernel_phys; + +void avp_early_init(void) +{ + int ret; + + avp_early_nvmap_drv = nvmap_create_client(nvmap_dev, "avp_early"); + if (IS_ERR(avp_early_nvmap_drv)) + pr_crit("%s: nvmap_create_client error\n", __func__); + + avp_early_kernel_handle = + nvmap_create_handle(avp_early_nvmap_drv, SZ_1M); + if (IS_ERR(avp_early_kernel_handle)) + pr_crit("%s: nvmap_create_handle error\n", __func__); + + ret = nvmap_alloc_handle_id(avp_early_nvmap_drv, + nvmap_ref_to_id(avp_early_kernel_handle), + NVMAP_HEAP_IOVMM, PAGE_SIZE, + NVMAP_HANDLE_WRITE_COMBINE); + if (ret) + pr_crit("%s: nvmap_alloc_handle_id error\n", __func__); + + avp_early_kernel_data = nvmap_mmap(avp_early_kernel_handle); + if (!avp_early_kernel_data) + pr_crit("%s: nvmap_mmap error\n", __func__); + + avp_early_kernel_phys = + nvmap_pin(avp_early_nvmap_drv, avp_early_kernel_handle); + if (IS_ERR((void *)avp_early_kernel_phys)) + pr_crit("%s: nvmap_pin error\n", __func__); + + pr_info("%s: allocated memory at %x for AVP kernel\n", + __func__, avp_early_kernel_phys); +} + static int tegra_avp_probe(struct platform_device *pdev) { void *msg_area; @@ -1594,7 +1632,14 @@ static int tegra_avp_probe(struct platform_device *pdev) heap_mask = 0; #endif - if (heap_mask) { + if (heap_mask == NVMAP_HEAP_IOVMM) { + avp->nvmap_drv = avp_early_nvmap_drv; + avp->kernel_handle = avp_early_kernel_handle; + avp->kernel_data = avp_early_kernel_data; + avp->kernel_phys = avp_early_kernel_phys; + } + + if (heap_mask == NVMAP_HEAP_CARVEOUT_MASK) { avp->kernel_handle = nvmap_create_handle(avp->nvmap_drv, SZ_1M); if (IS_ERR(avp->kernel_handle)) { pr_err("%s: cannot create kernel handle\n", __func__); diff --git a/drivers/video/tegra/nvmap/nvmap_dev.c b/drivers/video/tegra/nvmap/nvmap_dev.c index aeba57c85482..1ebb1f4dcf82 100644 --- a/drivers/video/tegra/nvmap/nvmap_dev.c +++ b/drivers/video/tegra/nvmap/nvmap_dev.c @@ -1207,6 +1207,14 @@ static int nvmap_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dev); nvmap_dev = dev; + +#if defined(CONFIG_TEGRA_AVP_KERNEL_ON_SMMU) + { + void avp_early_init(void); + avp_early_init(); + } +#endif + return 0; fail_heaps: for (i = 0; i < dev->nr_carveouts; i++) { |