gpu: ion: Add flag for forcing contiguous allocations

Previously, a parameter was added to secure heaps to only
allow secure allocations. Some clients still require
non-secure contiguous allocations even though the SMMU is
supported. Add support for those clients to force contiguous
allocations to go through.

Change-Id: I0d18d8a9ed3ab267b55c84c4ad160f8cec2c2b32
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>

Conflicts:
	drivers/gpu/ion/ion_cp_heap.c
	include/linux/msm_ion.h
gpu: ion: Add flag for forcing contiguous allocations
Previously, a parameter was added to secure heaps to only
allow secure allocations. Some clients still require
non-secure contiguous allocations even though the SMMU is
supported. Add support for those clients to force contiguous
allocations to go through.

Change-Id: I0d18d8a9ed3ab267b55c84c4ad160f8cec2c2b32
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>

Conflicts:
	drivers/gpu/ion/ion_cp_heap.c
	include/linux/msm_ion.h
Merge "coresight: resolve pcsave and etm tracing concurreny issue"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: graceful pcsave enable/disable for offline cores"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: change ETM locking scheme from mutex to spinlock"
Merge "coresight: graceful etm enable/disable for offline cores"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: add STM support for explicit userspace entity ids"
Conflicts:
	include/linux/coresight-stm.h
Merge "coresight: attempt to send data over STM only if size is non-zero"
Merge "coresight: keep drvdata->size as the actual buffer size"
Conflicts:
	drivers/coresight/coresight-tmc.c
Merge "coresight: Have trace_marker only log the actual data"
Merge "tracing: have trace_printk process arguments before storing"
Merge "coresight: resolve pcsave and etm tracing concurreny issue"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: graceful pcsave enable/disable for offline cores"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: change ETM locking scheme from mutex to spinlock"
Merge "coresight: graceful etm enable/disable for offline cores"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: add STM support for explicit userspace entity ids"
Conflicts:
	drivers/coresight/coresight-stm.c
Merge "coresight: attempt to send data over STM only if size is non-zero"
Merge "coresight: have trace_printk only log the actual data to STM"