From 88c7adfadd98447b36936c3de6ce13df5f0673a6 Mon Sep 17 00:00:00 2001 From: Veera Sundaram Sankaran Date: Fri, 3 Oct 2014 10:56:44 -0700 Subject: [PATCH] msm: mdss: Fix mdp img mapping and unmapping for ion memory Setting the correct return value for successful ion memory mapping and handling the unmapping for ion memory. Change-Id: I005ed3c4b09ddc9e559fa41929f11beb702d373d Signed-off-by: Veera Sundaram Sankaran --- drivers/video/fbdev/msm/mdss_mdp_util.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp_util.c b/drivers/video/fbdev/msm/mdss_mdp_util.c index 3a10c0556e9e..660622712875 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_util.c +++ b/drivers/video/fbdev/msm/mdss_mdp_util.c @@ -687,14 +687,15 @@ int mdss_mdp_put_img(struct mdss_mdp_img_data *data) msm_unmap_dma_buf(data->srcp_table, mdss_get_iommu_domain(domain), 0); - dma_buf_unmap_attachment(data->srcp_attachment, - data->srcp_table, - DMA_BIDIRECTIONAL); - - dma_buf_detach(data->srcp_dma_buf, - data->srcp_attachment); - dma_buf_put(data->srcp_dma_buf); } + + dma_buf_unmap_attachment(data->srcp_attachment, + data->srcp_table, DMA_BIDIRECTIONAL); + + dma_buf_detach(data->srcp_dma_buf, + data->srcp_attachment); + dma_buf_put(data->srcp_dma_buf); + data->srcp_dma_buf = NULL; } @@ -774,6 +775,7 @@ int mdss_mdp_get_img(struct msmfb_data *img, struct mdss_mdp_img_data *data, } else { *start = sg_phys(data->srcp_table->sgl); *len = data->srcp_table->sgl->length; + ret = 0; } if (IS_ERR_VALUE(ret)) {