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

Commit b76bafaa authored by Vishwanath Raju K's avatar Vishwanath Raju K Committed by Gerrit - the friendly Code Review server
Browse files

ion: msm: Add video HEAP ID 



This new heap shall be used for ION heap allocations
for video when s1 bypassed.

Change-Id: I77a707b18936893d4f2cb71b1fa1bf1f92ef6de7
Signed-off-by: default avatarVishwanath Raju K <vishk@codeaurora.org>
parent ffc6b87e

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-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2020, 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
@@ -44,6 +44,7 @@ 
#define ION_SECURE_HEAP_NAME	"secure_heap"

#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"

#define ION_AUDIO_HEAP_NAME    "audio"

#define ION_VIDEO_HEAP_NAME    "video"



#define ION_IS_CACHED(__flags)  ((__flags) & ION_FLAG_CACHED)

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

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

/* Copyright (c) 2017-2020, 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
@@ -75,6 +75,10 @@ static struct ion_heap_desc ion_heap_meta[] = { 
		.id     = ION_AUDIO_HEAP_ID,

		.name   = ION_AUDIO_HEAP_NAME,

	},

	{

		.id     = ION_VIDEO_HEAP_ID,

		.name   = ION_VIDEO_HEAP_NAME,

	},

	{

		.id	= ION_SECURE_CARVEOUT_HEAP_ID,

		.name	= ION_SECURE_CARVEOUT_HEAP_NAME,

drivers/staging/android/uapi/msm_ion.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ enum ion_heap_ids { 
	ION_CP_MM_HEAP_ID = 8,

	ION_SECURE_HEAP_ID = 9,

	ION_SECURE_DISPLAY_HEAP_ID = 10,

	ION_VIDEO_HEAP_ID = 12,

	ION_SPSS_HEAP_ID = 13, /* Secure Processor ION heap */

	ION_ADSP_HEAP_ID = 22,

	ION_SYSTEM_HEAP_ID = 25,