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

Commit 907ec65d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: Add support for ION_AUDIO_HEAP_ID"

parents 26d1d8b9 865f4bba

drivers/staging/android/ion/ion.h

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

 *

 * Copyright (C) 2011 Google, Inc.

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

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

 *

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

 * License version 2, as published by the Free Software Foundation, and
@@ -40,6 +40,7 @@ 
#define ION_QSECOM_HEAP_NAME	"qsecom"

#define ION_SECURE_HEAP_NAME	"secure_heap"

#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"

#define ION_AUDIO_HEAP_NAME    "audio"



/**

 * Debug feature. Make ION allocations DMA

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

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

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

 *

 * 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
@@ -64,6 +64,10 @@ static struct ion_heap_desc ion_heap_meta[] = { 
	{

		.id	= ION_SECURE_DISPLAY_HEAP_ID,

		.name	= ION_SECURE_DISPLAY_HEAP_NAME,

	},

	{

		.id     = ION_AUDIO_HEAP_ID,

		.name   = ION_AUDIO_HEAP_NAME,

	}

};

#endif

drivers/staging/android/uapi/msm_ion.h

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ enum ion_heap_ids { 
	ION_HEAP_ID_RESERVED = 31 /** Bit reserved for ION_FLAG_SECURE flag */

};



/**

 * Newly added heap ids have to be #define(d) since all API changes must

 * include a new #define.

 */

#define ION_AUDIO_HEAP_ID		28



/**

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

 * content protection