diff options
| author | Shu Zhang <chazhang@nvidia.com> | 2013-07-15 19:06:49 +0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:31:55 -0700 |
| commit | 7053c7337a5005fed104a838f69ba2fd2b5dfaa2 (patch) | |
| tree | 26d6e06e781f01d965678e3c40157a4ecb7ef357 /drivers/media/video | |
| parent | 641a0008a5d9539c99b6d520f5420b6544e97c37 (diff) | |
Clean up "t124-bringup-2013.07.14-v8.0" merge
Some DNI are not cleanly reverted. Cleared the code in:
arch/arm/configs/tegra12_android_defconfig
drivers/media/video/tegra/nvavp/nvavp_dev.c
Change-Id: I45afbf75e17224fe927f7f8825ab0b8b7dea542f
Signed-off-by: Shu Zhang <chazhang@nvidia.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/tegra/nvavp/nvavp_dev.c | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/drivers/media/video/tegra/nvavp/nvavp_dev.c b/drivers/media/video/tegra/nvavp/nvavp_dev.c index 43711ee8ff15..4ec612fd2dd6 100644 --- a/drivers/media/video/tegra/nvavp/nvavp_dev.c +++ b/drivers/media/video/tegra/nvavp/nvavp_dev.c @@ -1588,32 +1588,28 @@ static int tegra_nvavp_probe(struct platform_device *ndev) switch (heap_mask) { case NVMAP_HEAP_IOVMM: - iovmm_addr = 0x8ff00000; - - nvavp->os_info.handle = nvmap_alloc_iovm(nvavp->nvmap, SZ_1M, - L1_CACHE_BYTES, - NVMAP_HANDLE_UNCACHEABLE, - iovmm_addr); - if (IS_ERR_OR_NULL(nvavp->os_info.handle)) { - iovmm_addr = 0x0ff00000; - - nvavp->os_info.handle = nvmap_alloc_iovm(nvavp->nvmap, SZ_1M, - L1_CACHE_BYTES, - NVMAP_HANDLE_UNCACHEABLE, - iovmm_addr); - if (IS_ERR_OR_NULL(nvavp->os_info.handle)) { - dev_err(&ndev->dev, - "cannot map os handle\n"); - ret = PTR_ERR(nvavp->os_info.handle); - goto err_nvmap_alloc; + nvavp->os_info.phys = 0x8ff00000; + nvavp->os_info.data = dma_alloc_at_coherent( + &ndev->dev, + SZ_1M, + &nvavp->os_info.phys, + GFP_KERNEL); + + if (!nvavp->os_info.data || nvavp->os_info.phys != 0x8ff00000) { + nvavp->os_info.phys = 0x0ff00000; + nvavp->os_info.data = dma_alloc_at_coherent( + &ndev->dev, + SZ_1M, + &nvavp->os_info.phys, + GFP_KERNEL); + + if (!nvavp->os_info.data || + nvavp->os_info.phys != 0x0ff00000) { + dev_err(&ndev->dev, "cannot allocate IOVA memory\n"); + ret = -ENOMEM; } } - if (!nvavp->os_info.data || nvavp->os_info.phys != 0x0ff00000) { - dev_err(&ndev->dev, "cannot allocate IOVA memory\n"); - ret = -ENOMEM; - } - dev_info(&ndev->dev, "allocated IOVA at %lx for AVP os\n", (unsigned long)nvavp->os_info.phys); |