Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5f9f234 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "gpu: ion: system_heap: invalidate cache on cached pool allocations"

parents 2ad03112 cec9c695

drivers/gpu/ion/ion_system_heap.c

+6 −4
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ static void ion_system_heap_destroy_pools(struct ion_page_pool **pools) 
 * 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 @@ static int ion_system_heap_create_pools(struct ion_page_pool **pools) 


		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 @@ struct ion_heap *ion_system_heap_create(struct ion_platform_heap *unused) 
	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;