summaryrefslogtreecommitdiff
path: root/drivers/staging/android/ion/Makefile
diff options
context:
space:
mode:
authorBenjamin Gaignard <benjamin.gaignard@linaro.org>2013-12-13 14:24:44 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-14 08:57:17 -0800
commit349c9e13855109df99c5205a4e8d53d9fa169490 (patch)
tree73f79c4602efcda4fd35de98d29c6eb68e43e98c /drivers/staging/android/ion/Makefile
parent19007b1420ba6f780621aa2e710c44881e8be983 (diff)
gpu: ion: add CMA heap
New heap type ION_HEAP_TYPE_DMA where allocation is done with dma_alloc_coherent API. device coherent_dma_mask must be set to DMA_BIT_MASK(32). ion_platform_heap private field is used to retrieve the device linked to CMA, if NULL the default CMA area is used. ion_cma_get_sgtable is a copy of dma_common_get_sgtable function which should be in kernel 3.5 Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/ion/Makefile')
-rw-r--r--drivers/staging/android/ion/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile
index 306fff970de4..ce0f1ef1c233 100644
--- a/drivers/staging/android/ion/Makefile
+++ b/drivers/staging/android/ion/Makefile
@@ -1,3 +1,3 @@
obj-$(CONFIG_ION) += ion.o ion_heap.o ion_page_pool.o ion_system_heap.o \
- ion_carveout_heap.o ion_chunk_heap.o
+ ion_carveout_heap.o ion_chunk_heap.o ion_cma_heap.o
obj-$(CONFIG_ION_TEGRA) += tegra/