On Thu, Mar 02, 2017 at 01:44:44PM -0800, Laura Abbott wrote:
>
> Practiaclly speaking, most Ion heaps are either going to be available
> all the time (system heaps) or found based off of the reserved-memory
> node. Parse the CMA and reserved-memory nodes to assign the heaps.
>
> Signed-off-by: Laura Abbott <labbott@xxxxxxxxxx>
> ---
> drivers/staging/android/ion/Makefile | 2 +-
> drivers/staging/android/ion/ion_enumerate.c | 89 +++++++++++++++++++++++++++++
> 2 files changed, 90 insertions(+), 1 deletion(-)
> create mode 100644 drivers/staging/android/ion/ion_enumerate.c
>
> diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile
> index eef022b..4ebf655 100644
> --- a/drivers/staging/android/ion/Makefile
> +++ b/drivers/staging/android/ion/Makefile
> @@ -1,4 +1,4 @@
> -obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o
> +obj-$(CONFIG_ION) += ion.o ion-ioctl.o ion_heap.o ion_enumerate.o
> obj-$(CONFIG_ION_SYSTEM_HEAP) += ion_system_heap.o ion_page_pool.o
> obj-$(CONFIG_ION_CARVEOUT_HEAP) += ion_carveout_heap.o
> obj-$(CONFIG_ION_CHUNK_HEAP) += ion_chunk_heap.o
> diff --git a/drivers/staging/android/ion/ion_enumerate.c b/drivers/staging/android/ion/ion_enumerate.c
> new file mode 100644
> index 0000000..21344c7
> --- /dev/null
> +++ b/drivers/staging/android/ion/ion_enumerate.c
> @@ -0,0 +1,89 @@
> +#include <linux/kernel.h>
> +#include <linux/cma.h>
> +
> +#include "ion.h"
> +#include "ion_priv.h"
> +
> +static struct ion_device *internal_dev;
> +static int heap_id = 2;
> +
> +static int ion_add_system_heap(void)
> +{
> +#ifdef CONFIG_ION_SYSTEM_HEAP
> + struct ion_platform_heap pheap;
> + struct ion_heap *heap;
> +
> + pheap.type = ION_HEAP_TYPE_SYSTEM;
> + pheap.id = heap_id++;
> + pheap.name = "ion_system_heap";
> +
> + heap = ion_heap_create(&pheap);
> + if (!heap)
> + return -ENODEV;
> +
> + ion_device_add_heap(internal_dev, heap);
> +#endif
> + return 0;
> +}
> +
> +static int ion_add_system_contig_heap(void)
> +{
> +#ifdef CONFIG_ION_SYSTEM_HEAP
> + struct ion_platform_heap pheap;
> + struct ion_heap *heap;
> +
> + pheap.type = ION_HEAP_TYPE_SYSTEM_CONTIG;
> + pheap.id = heap_id++;
> + pheap.name = "ion_system_contig_heap";
> +
> + heap = ion_heap_create(&pheap);
> + if (!heap)
> + return -ENODEV;
> +
> + ion_device_add_heap(internal_dev, heap);
> +#endif
> + return 0;
> +}
> +
> +#ifdef CONFIG_ION_CMA_HEAP
> +int __ion_add_cma_heaps(struct cma *cma, void *data)
> +{
> + struct ion_heap *heap;
> + struct ion_platform_heap pheap;
> +
> + pheap.type = ION_HEAP_TYPE_DMA;
> + pheap.id = heap_id++;
> + pheap.name = cma_get_name(cma);
> + pheap.priv = cma;
> +
> + heap = ion_heap_create(&pheap);
> + if (!heap)
> + return -ENODEV;
> +
> + ion_device_add_heap(internal_dev, heap);
> + return 0;
> +}
> +#endif
> +
> +
> +static int ion_add_cma_heaps(void)
> +{
> +#ifdef CONFIG_ION_CMA_HEAP
> + cma_for_each_area(__ion_add_cma_heaps, NULL);
> +#endif
> + return 0;
> +}
> +
> +int ion_enumerate(void)
> +{
> + internal_dev = ion_device_create(NULL);
> + if (IS_ERR(internal_dev))
> + return PTR_ERR(internal_dev);
> +
> + ion_add_system_heap();
> + ion_add_system_contig_heap();
> +
> + ion_add_cma_heaps();
> + return 0;
> +}
> +subsys_initcall(ion_enumerate);
If we'd split each heap into its own file I think we could just put
initcalls into each of them, avoiding the need for so much #ifdef all
over.
That should also help when we add more specific heaps like the SMA one.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
