diff --git a/drivers/soc/qcom/mem-buf.c b/drivers/soc/qcom/mem-buf.c
index 35247e729f1f..18d2bcd31b83 100644
--- a/drivers/soc/qcom/mem-buf.c
+++ b/drivers/soc/qcom/mem-buf.c
@@ -973,7 +973,7 @@ static int mem_buf_unmap_mem_s2(hh_memparcel_handle_t memparcel_hdl)
 	int ret;
 
 	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)
 		pr_err("%s: Failed to release memparcel hdl: 0x%lx rc: %d\n",
diff --git a/drivers/staging/android/ion/heaps/msm_ion.c b/drivers/staging/android/ion/heaps/msm_ion.c
index 7a32a9caa5f5..034ada0db765 100644
--- a/drivers/staging/android/ion/heaps/msm_ion.c
+++ b/drivers/staging/android/ion/heaps/msm_ion.c
@@ -83,6 +83,10 @@ static struct ion_heap_desc ion_heap_meta[] = {
 		.id	= ION_TUI_CARVEOUT_HEAP_ID,
 		.name	= ION_TUI_CARVEOUT_HEAP_NAME,
 	},
+	{
+		.id	= ION_DISPLAY_HEAP_ID,
+		.name	= ION_DISPLAY_HEAP_NAME,
+	},
 };
 
 #define MAKE_HEAP_TYPE_MAPPING(h) { .name = #h, \
diff --git a/drivers/staging/android/ion/heaps/msm_ion_priv.h b/drivers/staging/android/ion/heaps/msm_ion_priv.h
index 1841ed5c12a2..25ef749ae70d 100644
--- a/drivers/staging/android/ion/heaps/msm_ion_priv.h
+++ b/drivers/staging/android/ion/heaps/msm_ion_priv.h
@@ -39,6 +39,7 @@
 #define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"
 #define ION_AUDIO_HEAP_NAME    "audio"
 #define ION_TUI_CARVEOUT_HEAP_NAME "tui_carveout"
+#define ION_DISPLAY_HEAP_NAME "display"
 
 /**
  * Debug feature. Make ION allocations DMA
diff --git a/include/uapi/linux/msm_ion_ids.h b/include/uapi/linux/msm_ion_ids.h
index c2e7a4d9546e..30a75bcc63a8 100644
--- a/include/uapi/linux/msm_ion_ids.h
+++ b/include/uapi/linux/msm_ion_ids.h
@@ -19,6 +19,7 @@
 #define ION_SYSTEM_HEAP_ID		ION_BIT(0)
 #define ION_QSECOM_TA_HEAP_ID		ION_BIT(1)
 #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_USER_CONTIG_HEAP_ID		ION_BIT(6)
 #define ION_QSECOM_HEAP_ID		ION_BIT(7)