summaryrefslogtreecommitdiff
path: root/drivers/media/video
diff options
context:
space:
mode:
authorKaz Fukuoka <kfukuoka@nvidia.com>2011-08-16 14:43:43 -0700
committerVarun Colbert <vcolbert@nvidia.com>2011-08-18 11:58:57 -0700
commit6de80e8c556ccb13fd76e9b5167b0315899ce905 (patch)
tree3e09f74dd70fcf0c7458c9d8d065159b7eac90ac /drivers/media/video
parent2f2f236e288a96945ce04e625d229f4a7c60e831 (diff)
media: tegra: avp: Use uncached for loading firmware
- Change NVMAP_HANDLE_WRITE_COMBINE to NVMAP_HANDLE_UNCACHEABLE. bug 829028 Change-Id: I311cc0cefeedcbe008c71afab4ac32942cd65de8 Reviewed-on: http://git-master/r/47386 Reviewed-by: Kaz Fukuoka <kfukuoka@nvidia.com> Tested-by: Kaz Fukuoka <kfukuoka@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/tegra/avp/avp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/tegra/avp/avp.c b/drivers/media/video/tegra/avp/avp.c
index 26a303c5f78f..23788a22541e 100644
--- a/drivers/media/video/tegra/avp/avp.c
+++ b/drivers/media/video/tegra/avp/avp.c
@@ -1156,7 +1156,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_WRITE_COMBINE);
+ NVMAP_HANDLE_UNCACHEABLE);
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);
@@ -1593,7 +1593,7 @@ void avp_early_init(void)
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);
+ NVMAP_HANDLE_UNCACHEABLE);
if (ret)
pr_crit("%s: nvmap_alloc_handle_id error\n", __func__);
@@ -1654,7 +1654,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_WRITE_COMBINE);
+ NVMAP_HANDLE_UNCACHEABLE);
if (IS_ERR_OR_NULL(avp->kernel_handle)) {
pr_err("%s: cannot create handle\n", __func__);
ret = PTR_ERR(avp->kernel_handle);
@@ -1685,7 +1685,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_WRITE_COMBINE);
+ L1_CACHE_BYTES, NVMAP_HANDLE_UNCACHEABLE);
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);