From da4c79c55b74a1b0a18261f27d6d93bf35e0b58b Mon Sep 17 00:00:00 2001 From: Krishna Manikandan Date: Fri, 29 Mar 2019 12:11:15 +0530 Subject: [PATCH] drm/msm: avoid unmapping the buffer twice during msm_release The dma buffer associated with the gem object is already unmapped during put_iova. Avoid unmapping it again in put_pages. Change-Id: Iac57e164dde6f3e5913070acbe74b42691049913 Signed-off-by: Krishna Manikandan --- msm/msm_gem.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/msm/msm_gem.c b/msm/msm_gem.c index f7b9ef4c58..3554f22b65 100644 --- a/msm/msm_gem.c +++ b/msm/msm_gem.c @@ -137,23 +137,10 @@ static void put_pages_vram(struct drm_gem_object *obj) static void put_pages(struct drm_gem_object *obj) { - struct device *aspace_dev; struct msm_gem_object *msm_obj = to_msm_bo(obj); if (msm_obj->pages) { if (msm_obj->sgt) { - /* For non-cached buffers, ensure the new - * pages are clean because display controller, - * GPU, etc. are not coherent: - */ - if (msm_obj->flags & (MSM_BO_WC|MSM_BO_UNCACHED)) { - aspace_dev = - msm_gem_get_aspace_device(msm_obj->aspace); - dma_unmap_sg(aspace_dev, msm_obj->sgt->sgl, - msm_obj->sgt->nents, - DMA_BIDIRECTIONAL); - } - sg_free_table(msm_obj->sgt); kfree(msm_obj->sgt); }