linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 1/1] drm: msm: Replace dma_map_sg with dma_sync_sg*
@ 2018-11-29 14:03 Vivek Gautam
  2018-11-29 14:14 ` Christoph Hellwig
  0 siblings, 1 reply; 34+ messages in thread
From: Vivek Gautam @ 2018-11-29 14:03 UTC (permalink / raw)
  To: airlied, robdclark
  Cc: dri-devel, linux-kernel, freedreno, tfiga, architt,
	linux-arm-msm, Vivek Gautam, Christoph Hellwig, Robin Murphy,
	Jordan Crouse, Sean Paul

dma_map_sg() expects a DMA domain. However, the drm devices
have been traditionally using unmanaged iommu domain which
is non-dma type. Using dma mapping APIs with that domain is bad.

Replace dma_map_sg() calls with dma_sync_sg_for_device{|cpu}()
to do the cache maintenance.

Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Suggested-by: Tomasz Figa <tfiga@chromium.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Jordan Crouse <jcrouse@codeaurora.org>
Cc: Sean Paul <seanpaul@chromium.org>
---

Changes since v2:
 - Addressed Tomasz's comment to keep DMA_BIDIRECTIONAL dma direction
   flag intact.
 - Updated comment for sg's dma-address assignment as per Tomasz'
   suggestion.

 drivers/gpu/drm/msm/msm_gem.c | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 00c795ced02c..7048e9fe00c6 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -81,6 +81,8 @@ static struct page **get_pages(struct drm_gem_object *obj)
 		struct drm_device *dev = obj->dev;
 		struct page **p;
 		int npages = obj->size >> PAGE_SHIFT;
+		struct scatterlist *s;
+		int i;
 
 		if (use_pages(obj))
 			p = drm_gem_get_pages(obj);
@@ -104,12 +106,23 @@ static struct page **get_pages(struct drm_gem_object *obj)
 			return ptr;
 		}
 
-		/* For non-cached buffers, ensure the new pages are clean
+		/*
+		 * Some implementations of the DMA mapping ops expect
+		 * physical addresses of the pages to be stored as DMA
+		 * addresses of the sglist entries. To work around it,
+		 * set them here explicitly.
+		 */
+		for_each_sg(msm_obj->sgt->sgl, s, msm_obj->sgt->nents, i)
+			sg_dma_address(s) = sg_phys(s);
+
+		/*
+		 * 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))
-			dma_map_sg(dev->dev, msm_obj->sgt->sgl,
-					msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
+		if (msm_obj->flags & (MSM_BO_WC | MSM_BO_UNCACHED))
+			dma_sync_sg_for_device(dev->dev, msm_obj->sgt->sgl,
+					       msm_obj->sgt->nents,
+					       DMA_BIDIRECTIONAL);
 	}
 
 	return msm_obj->pages;
@@ -133,14 +146,16 @@ static void put_pages(struct drm_gem_object *obj)
 
 	if (msm_obj->pages) {
 		if (msm_obj->sgt) {
-			/* For non-cached buffers, ensure the new
+			/*
+			 * 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))
-				dma_unmap_sg(obj->dev->dev, msm_obj->sgt->sgl,
-					     msm_obj->sgt->nents,
-					     DMA_BIDIRECTIONAL);
+			if (msm_obj->flags & (MSM_BO_WC | MSM_BO_UNCACHED))
+				dma_sync_sg_for_cpu(obj->dev->dev,
+						    msm_obj->sgt->sgl,
+						    msm_obj->sgt->nents,
+						    DMA_BIDIRECTIONAL);
 
 			sg_free_table(msm_obj->sgt);
 			kfree(msm_obj->sgt);
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation


^ permalink raw reply related	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2018-12-07 14:29 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-29 14:03 [PATCH v3 1/1] drm: msm: Replace dma_map_sg with dma_sync_sg* Vivek Gautam
2018-11-29 14:14 ` Christoph Hellwig
2018-11-29 14:25   ` Rob Clark
2018-11-29 14:42     ` Rob Clark
2018-11-29 15:54       ` Christoph Hellwig
2018-11-29 18:48         ` Rob Clark
2018-11-29 19:40           ` Jordan Crouse
2018-11-29 19:57             ` Tomasz Figa
2018-11-29 20:03               ` Robin Murphy
2018-11-30  0:23                 ` Tomasz Figa
2018-12-01  2:05                   ` Tomasz Figa
2018-12-01 11:46                     ` Rob Clark
2018-12-03  0:12                       ` Tomasz Figa
2018-11-29 14:43     ` Daniel Vetter
2018-11-29 15:57       ` Christoph Hellwig
2018-11-29 16:28         ` Daniel Vetter
2018-11-29 16:57           ` Christoph Hellwig
2018-11-29 17:09             ` Daniel Vetter
2018-11-29 17:24               ` Tomasz Figa
2018-11-29 18:35                 ` Christoph Hellwig
2018-11-29 18:57                 ` Rob Clark
2018-11-30  9:40                   ` Daniel Vetter
2018-11-30  9:35                 ` Daniel Vetter
2018-11-30  9:44                   ` Christoph Hellwig
2018-11-29 18:33               ` Christoph Hellwig
2018-11-30  9:46                 ` Daniel Vetter
2018-12-07  1:38                   ` Christoph Hellwig
2018-12-07 14:29                     ` Rob Clark
2018-11-29 17:33             ` Brian Starkey
2018-11-29 18:35               ` Christoph Hellwig
2018-11-30  1:15         ` Rob Clark
2018-11-30  9:35           ` Christoph Hellwig
2018-11-29 15:53     ` Christoph Hellwig
2018-11-29 18:44       ` Rob Clark

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).