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

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

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

parents e1c1b413 4097d52c

drivers/staging/android/ion/ion.c

+1 −0
Original line number Diff line number Diff line
@@ -1102,6 +1102,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 == (enum ion_heap_type)ION_HEAP_TYPE_HYP_CMA ||

		    heap->type ==

			(enum ion_heap_type)ION_HEAP_TYPE_SYSTEM_SECURE) {

			type_valid = true;