evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ion: Remove secure and unsecure buffer APIs

Browse source 
These APIs are deprecated as securing and unsecuring for secure
buffers is done on allocation and free respectively by the secure
heap layer. Clients don't have to call these explicitly.

Change-Id: If88cd1c47cba346446ebdcad494850b54ba954ab
(cherry picked from commit 171909b3ee7af285d939a8c384be64605d817716)
[veeras@codeaurora.org: Done as part of 3.18 upgrade
	Remove files from commit, as its not related to display
	drivers/media/platform/msm/vidc/msm_smem.c
	drivers/media/platform/msm/vpu/vpu_resources.c
	drivers/media/platform/msm/wfd/enc-venus-subdev.c
	drivers/media/platform/msm/wfd/mdp-5-subdev.c
	drivers/staging/android/ion/msm/msm_ion.h
	drivers/staging/android/ion/msm/secure_buffer.c]
Signed-off-by: Shalaj Jain <shalajj@codeaurora.org>
Signed-off-by: Veera Sundaram Sankaran <veeras@codeaurora.org>
This commit is contained in:
Shalaj Jain 2014-09-10 15:51:58 -07:00 • committed by David Keitel
parent 642f820a27
commit 085f3fb830
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/video/fbdev/msm/mdss_mdp_util.c
View file

@ -530,11 +530,6 @@ int mdss_mdp_put_img(struct mdss_mdp_img_data *data)
dma_buf_detach(data->srcp_dma_buf,
data->srcp_attachment);
dma_buf_put(data->srcp_dma_buf);
if (domain == MDSS_IOMMU_DOMAIN_SECURE) {
msm_ion_unsecure_table(
data->srcp_table);
}
}
data->srcp_dma_buf = NULL;
}
@ -603,24 +598,15 @@ int mdss_mdp_get_img(struct msmfb_data *img, struct mdss_mdp_img_data *data,
if (is_mdss_iommu_attached()) {
int domain;
if (data->flags & MDP_SECURE_OVERLAY_SESSION) {
if (data->flags & MDP_SECURE_OVERLAY_SESSION)
domain = MDSS_IOMMU_DOMAIN_SECURE;
ret = msm_ion_secure_table(data->srcp_table, 0x2, 0);
if (IS_ERR_VALUE(ret)) {
pr_err("failed to secure handle (%d)\n",
ret);
goto err_unmap;
}
} else {
else
domain = MDSS_IOMMU_DOMAIN_UNSECURE;
}
ret = msm_map_dma_buf(data->srcp_dma_buf,
data->srcp_table,
mdss_get_iommu_domain(domain),
0, SZ_4K, 0, start, len, 0, 0);
if (ret && (domain == MDSS_IOMMU_DOMAIN_SECURE))
msm_ion_unsecure_table(data->srcp_table);
} else {
*start = sg_phys(data->srcp_table->sgl);
*len = data->srcp_table->sgl->length;