aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSundar Raman2013-07-25 08:43:29 -0500
committerSundar Raman2013-07-26 16:00:49 -0500
commit473f405fbacba955b461a0f3c4cea09dfdf74980 (patch)
tree9ed70df3fed684a2e422c5f24867634f6c1e2c6c
parent7d7ad5311aca079575ef1278ef3812c833d9f775 (diff)
downloadkernel-video-473f405fbacba955b461a0f3c4cea09dfdf74980.tar.gz
kernel-video-473f405fbacba955b461a0f3c4cea09dfdf74980.tar.xz
kernel-video-473f405fbacba955b461a0f3c4cea09dfdf74980.zip
gpu: ion: DRA7: ensure TILER 2d mappings are shared device
Write combined mappings are not supported for TILER 2D on DRA7 similar to OMAP5 due to h/w issue. So, shared mappings should be used. Added the check which was missing for DRA7. Change-Id: I8ba9bd676f2942dd6a8bd5737bab8e25c8f1cbd3 Signed-off-by: Sundar Raman <a0393242@ti.com>
-rw-r--r--drivers/gpu/ion/omap/omap_tiler_heap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/ion/omap/omap_tiler_heap.c b/drivers/gpu/ion/omap/omap_tiler_heap.c
index c3ac4f169c3..cbd16cf6c52 100644
--- a/drivers/gpu/ion/omap/omap_tiler_heap.c
+++ b/drivers/gpu/ion/omap/omap_tiler_heap.c
@@ -75,7 +75,7 @@ static int omap_tiler_heap_allocate(struct ion_heap *heap,
75 */ 75 */
76 info = (struct omap_tiler_info *) flags; 76 info = (struct omap_tiler_info *) flags;
77 if (!info) 77 if (!info)
78 pr_err("%s: flags argument is not setup\n", __func__); 78 pr_err("%s: flags argument is not setupg\n", __func__);
79 buffer->priv_virt = info; 79 buffer->priv_virt = info;
80 /* Re-update correct flags inside buffer */ 80 /* Re-update correct flags inside buffer */
81 buffer->flags = info->flags; 81 buffer->flags = info->flags;
@@ -339,9 +339,9 @@ static int omap_tiler_heap_map_user(struct ion_heap *heap,
339 int i, ret = 0; 339 int i, ret = 0;
340 pgprot_t vm_page_prot; 340 pgprot_t vm_page_prot;
341 341
342 /* Use writecombined mappings unless on OMAP5. If OMAP5, use 342 /* Use writecombined mappings unless on OMAP5 or DRA7. If OMAP5 or DRA7, use
343 shared device due to h/w issue. */ 343 shared device due to h/w issue. */
344 if (soc_is_omap54xx()) 344 if (soc_is_omap54xx() || soc_is_dra7xx())
345 vm_page_prot = __pgprot_modify(vma->vm_page_prot, L_PTE_MT_MASK, 345 vm_page_prot = __pgprot_modify(vma->vm_page_prot, L_PTE_MT_MASK,
346 L_PTE_MT_DEV_SHARED); 346 L_PTE_MT_DEV_SHARED);
347 else 347 else