diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2011-09-06 23:34:42 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:12 -0800 |
| commit | c2dc06e54f86e2df30c5dbddea609e1bc50bd0fa (patch) | |
| tree | 4edb6d4e196b4cac1696c993a012a3e9f95d1516 /drivers/video/tegra/nvmap/nvmap_dev.c | |
| parent | 849cd2d987fe5753bd3e17745c05faf1c3322ac9 (diff) | |
video: tegra: nvmap: Add VPR heap support.
Reviewed-on: http://git-master/r/51026
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Tested-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
(cherry picked from commit 060055eea2082adb6da4cf27462ff699fdf2b4e9)
Change-Id: I9244dff21e9cd62b14f97bfb5a5349eb46f73847
Reviewed-on: http://git-master/r/56107
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Tested-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Rebase-Id: Rd3f4f8799a3acad27234422b39a4def0a439e3f3
Diffstat (limited to 'drivers/video/tegra/nvmap/nvmap_dev.c')
| -rw-r--r-- | drivers/video/tegra/nvmap/nvmap_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap_dev.c b/drivers/video/tegra/nvmap/nvmap_dev.c index c98c0bb3bea8..c3a5f7f0de36 100644 --- a/drivers/video/tegra/nvmap/nvmap_dev.c +++ b/drivers/video/tegra/nvmap/nvmap_dev.c @@ -1265,7 +1265,7 @@ static int nvmap_probe(struct platform_device *pdev) dev_err(&pdev->dev, "couldn't create debug files\n"); for (i = 0; i < plat->nr_carveouts; i++) { - struct nvmap_carveout_node *node = &dev->heaps[i]; + struct nvmap_carveout_node *node = &dev->heaps[dev->nr_carveouts]; const struct nvmap_platform_carveout *co = &plat->carveouts[i]; if (!co->size) continue; @@ -1277,9 +1277,9 @@ static int nvmap_probe(struct platform_device *pdev) dev_err(&pdev->dev, "couldn't create %s\n", co->name); goto fail_heaps; } + node->index = dev->nr_carveouts; dev->nr_carveouts++; spin_lock_init(&node->clients_lock); - node->index = i; INIT_LIST_HEAD(&node->clients); node->heap_bit = co->usage_mask; if (nvmap_heap_create_group(node->carveout, |