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

Commit 093dd4b7 authored by Sudarshan Rajagopalan's avatar Sudarshan Rajagopalan Committed by Gerrit - the friendly Code Review server
Browse files

ion: msm: Add User Contiguous Heap ID 



This new heap shall be used for ION heap allocations
for HLOS and user applications.

Change-Id: I38944ea6fc620c73c796eff1acb2f23e2c044330
Signed-off-by: default avatarSudarshan Rajagopalan <sudaraja@codeaurora.org>
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent 7dc9db11

drivers/staging/android/ion/ion.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * drivers/staging/android/ion/ion.h

 * drivers/staging/android/ion/ion.h

 *

 *

 * Copyright (C) 2011 Google, Inc.

 * Copyright (C) 2011 Google, Inc.

 * Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.

 *

 *

 * This software is licensed under the terms of the GNU General Public

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * License version 2, as published by the Free Software Foundation, and
@@ -38,6 +38,7 @@ 
#define ION_MM_HEAP_NAME	"mm"

#define ION_MM_HEAP_NAME	"mm"

#define ION_SPSS_HEAP_NAME	"spss"

#define ION_SPSS_HEAP_NAME	"spss"

#define ION_SECURE_CARVEOUT_HEAP_NAME	"secure_carveout"

#define ION_SECURE_CARVEOUT_HEAP_NAME	"secure_carveout"

#define ION_USER_CONTIG_HEAP_NAME	"user_contig"

#define ION_QSECOM_HEAP_NAME	"qsecom"

#define ION_QSECOM_HEAP_NAME	"qsecom"

#define ION_QSECOM_TA_HEAP_NAME	"qsecom_ta"

#define ION_QSECOM_TA_HEAP_NAME	"qsecom_ta"

#define ION_SECURE_HEAP_NAME	"secure_heap"

#define ION_SECURE_HEAP_NAME	"secure_heap"

drivers/staging/android/ion/msm/msm_ion_of.c

+5 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -48,6 +48,10 @@ static struct ion_heap_desc ion_heap_meta[] = { 
		.id	= ION_CP_MM_HEAP_ID,

		.id	= ION_CP_MM_HEAP_ID,

		.name	= ION_MM_HEAP_NAME,

		.name	= ION_MM_HEAP_NAME,

	},

	},

	{

		.id	= ION_USER_CONTIG_HEAP_ID,

		.name	= ION_USER_CONTIG_HEAP_NAME,

	},

	{

	{

		.id	= ION_QSECOM_HEAP_ID,

		.id	= ION_QSECOM_HEAP_ID,

		.name	= ION_QSECOM_HEAP_NAME,

		.name	= ION_QSECOM_HEAP_NAME,

drivers/staging/android/uapi/msm_ion.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ enum ion_heap_ids { 
#define ION_QSECOM_TA_HEAP_ID		19

#define ION_QSECOM_TA_HEAP_ID		19

#define ION_AUDIO_HEAP_ID		28

#define ION_AUDIO_HEAP_ID		28

#define ION_CAMERA_HEAP_ID		20

#define ION_CAMERA_HEAP_ID		20

#define ION_USER_CONTIG_HEAP_ID		26

/**

/**

 * Flags to be used when allocating from the secure heap for

 * Flags to be used when allocating from the secure heap for

 * content protection

 * content protection