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

Commit e663ce57 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "staging: android: ion: Add support for Carveout allocations in ion_alloc"

parents 886009ca b0ab9807

drivers/staging/android/ion/ion.c

+1 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,7 @@ struct dma_buf *ion_alloc(size_t len, unsigned int heap_id_mask, 
		if (!((1 << heap->id) & heap_id_mask))

			continue;

		if (heap->type == ION_HEAP_TYPE_SYSTEM ||

		    heap->type == ION_HEAP_TYPE_CARVEOUT ||

		    heap->type == (enum ion_heap_type)ION_HEAP_TYPE_HYP_CMA ||

		    heap->type ==

			(enum ion_heap_type)ION_HEAP_TYPE_SYSTEM_SECURE) {