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

Commit bbc7f2d3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: Add support for the display non-secure CMA heap"

parents 46c87ffa 07b094ae

drivers/soc/qcom/mem-buf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -973,7 +973,7 @@ static int mem_buf_unmap_mem_s2(hh_memparcel_handle_t memparcel_hdl) 
	int ret;

	int ret;





	pr_debug("%s: removing CPU MMU stage 2 mappings\n", __func__);

	pr_debug("%s: removing CPU MMU stage 2 mappings\n", __func__);

	ret = hh_rm_mem_release(memparcel_hdl, HH_RM_MEM_RELEASE_CLEAR);

	ret = hh_rm_mem_release(memparcel_hdl, 0);





	if (ret < 0)

	if (ret < 0)

		pr_err("%s: Failed to release memparcel hdl: 0x%lx rc: %d\n",

		pr_err("%s: Failed to release memparcel hdl: 0x%lx rc: %d\n",

drivers/staging/android/ion/heaps/msm_ion.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,10 @@ static struct ion_heap_desc ion_heap_meta[] = { 
		.id	= ION_TUI_CARVEOUT_HEAP_ID,

		.id	= ION_TUI_CARVEOUT_HEAP_ID,

		.name	= ION_TUI_CARVEOUT_HEAP_NAME,

		.name	= ION_TUI_CARVEOUT_HEAP_NAME,

	},

	},

	{

		.id	= ION_DISPLAY_HEAP_ID,

		.name	= ION_DISPLAY_HEAP_NAME,

	},

};

};





#define MAKE_HEAP_TYPE_MAPPING(h) { .name = #h, \

#define MAKE_HEAP_TYPE_MAPPING(h) { .name = #h, \

drivers/staging/android/ion/heaps/msm_ion_priv.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"

#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"

#define ION_AUDIO_HEAP_NAME    "audio"

#define ION_AUDIO_HEAP_NAME    "audio"

#define ION_TUI_CARVEOUT_HEAP_NAME "tui_carveout"

#define ION_TUI_CARVEOUT_HEAP_NAME "tui_carveout"

#define ION_DISPLAY_HEAP_NAME "display"





/**

/**

 * Debug feature. Make ION allocations DMA

 * Debug feature. Make ION allocations DMA

include/uapi/linux/msm_ion_ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define ION_SYSTEM_HEAP_ID		ION_BIT(0)

#define ION_SYSTEM_HEAP_ID		ION_BIT(0)

#define ION_QSECOM_TA_HEAP_ID		ION_BIT(1)

#define ION_QSECOM_TA_HEAP_ID		ION_BIT(1)

#define ION_CAMERA_HEAP_ID		ION_BIT(2)

#define ION_CAMERA_HEAP_ID		ION_BIT(2)

#define ION_DISPLAY_HEAP_ID		ION_BIT(3)

#define ION_ADSP_HEAP_ID		ION_BIT(4)

#define ION_ADSP_HEAP_ID		ION_BIT(4)

#define ION_USER_CONTIG_HEAP_ID		ION_BIT(6)

#define ION_USER_CONTIG_HEAP_ID		ION_BIT(6)

#define ION_QSECOM_HEAP_ID		ION_BIT(7)

#define ION_QSECOM_HEAP_ID		ION_BIT(7)