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

Commit c30707be authored by Rebecca Schultz Zavin's avatar Rebecca Schultz Zavin Committed by Greg Kroah-Hartman
Browse files

gpu: ion: Add ION Memory Manager 



Signed-off-by: default avatarRebecca Schultz Zavin <rebecca@android.com>
[jstultz: Squished in Colin Cross' move to staging change,
also disables ION from the build, as it won't compile till
the end of the patchset]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 530376bf

drivers/staging/android/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ config SW_SYNC_USER 
	  *WARNING* improper use of this can result in deadlocking kernel

	  drivers from userspace.



source "drivers/staging/android/ion/Kconfig"



endif # if ANDROID



endmenu

drivers/staging/android/Makefile

+3 −0
Original line number Diff line number Diff line 
ccflags-y += -I$(src)			# needed for trace events



# ION doesn't build just yet, so disable it from the build

#obj-y					+= ion/



obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o

obj-$(CONFIG_ASHMEM)			+= ashmem.o

obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o

drivers/staging/android/ion/Kconfig

0 → 100644
+12 −0
Original line number Diff line number Diff line 
menuconfig ION

	tristate "Ion Memory Manager"

	select GENERIC_ALLOCATOR

	help

	  Chose this option to enable the ION Memory Manager.



config ION_TEGRA

	tristate "Ion for Tegra"

	depends on ARCH_TEGRA && ION

	help

	  Choose this option if you wish to use ion on an nVidia Tegra.

drivers/staging/android/ion/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_ION) +=	ion.o ion_heap.o ion_system_heap.o ion_carveout_heap.o

obj-$(CONFIG_ION_TEGRA) += tegra/

drivers/staging/android/ion/ion.c

0 → 100644
+1187 −0

File added.

Preview size limit exceeded, changes collapsed.