Merge "gpu: ion: system_heap: invalidate cache on cached pool allocations"
diff --git a/drivers/gpu/ion/ion_system_heap.c b/drivers/gpu/ion/ion_system_heap.c
index 0c1230b..8e885b2 100644
--- a/drivers/gpu/ion/ion_system_heap.c
+++ b/drivers/gpu/ion/ion_system_heap.c
@@ -355,7 +355,8 @@
* nothing. If it succeeds you'll eventually need to use
* ion_system_heap_destroy_pools to destroy the pools.
*/
-static int ion_system_heap_create_pools(struct ion_page_pool **pools)
+static int ion_system_heap_create_pools(struct ion_page_pool **pools,
+ bool should_invalidate)
{
int i;
for (i = 0; i < num_orders; i++) {
@@ -364,7 +365,8 @@
if (orders[i] > 4)
gfp_flags = high_order_gfp_flags;
- pool = ion_page_pool_create(gfp_flags, orders[i], false);
+ pool = ion_page_pool_create(gfp_flags, orders[i],
+ should_invalidate);
if (!pool)
goto err_create_pool;
pools[i] = pool;
@@ -395,10 +397,10 @@
if (!heap->cached_pools)
goto err_alloc_cached_pools;
- if (ion_system_heap_create_pools(heap->uncached_pools))
+ if (ion_system_heap_create_pools(heap->uncached_pools, false))
goto err_create_uncached_pools;
- if (ion_system_heap_create_pools(heap->cached_pools))
+ if (ion_system_heap_create_pools(heap->cached_pools, true))
goto err_create_cached_pools;
heap->heap.shrinker.shrink = ion_system_heap_shrink;