From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Christoph Hellwig <hch@lst.de>,
Rob Clark <robdclark@chromium.org>,
Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] drm/msm: use drm_cache when available
Date: Mon, 5 Aug 2019 14:14:34 -0700 [thread overview]
Message-ID: <20190805211451.20176-2-robdclark@gmail.com> (raw)
In-Reply-To: <20190805211451.20176-1-robdclark@gmail.com>
From: Rob Clark <robdclark@chromium.org>
For a long time drm/msm had been abusing dma_map_* or dma_sync_* to
clean pages for buffers with uncached/writecombine CPU mmap'ings.
But drm/msm is managing it's own iommu domains, and really doesn't want
the additional functionality provided by various DMA API ops.
Let's just cut the abstraction and use drm_cache where possible.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/msm_gem.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 8cf6362e64bf..af19ef20d0d5 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -9,6 +9,8 @@
#include <linux/dma-buf.h>
#include <linux/pfn_t.h>
+#include <drm/drm_cache.h>
+
#include "msm_drv.h"
#include "msm_fence.h"
#include "msm_gem.h"
@@ -48,6 +50,7 @@ static bool use_pages(struct drm_gem_object *obj)
static void sync_for_device(struct msm_gem_object *msm_obj)
{
+#if !defined(HAS_DRM_CACHE)
struct device *dev = msm_obj->base.dev->dev;
if (get_dma_ops(dev)) {
@@ -57,10 +60,14 @@ static void sync_for_device(struct msm_gem_object *msm_obj)
dma_map_sg(dev, msm_obj->sgt->sgl,
msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
}
+#else
+ drm_clflush_sg(msm_obj->sgt);
+#endif
}
static void sync_for_cpu(struct msm_gem_object *msm_obj)
{
+#if !defined(HAS_DRM_CACHE)
struct device *dev = msm_obj->base.dev->dev;
if (get_dma_ops(dev)) {
@@ -70,6 +77,7 @@ static void sync_for_cpu(struct msm_gem_object *msm_obj)
dma_unmap_sg(dev, msm_obj->sgt->sgl,
msm_obj->sgt->nents, DMA_BIDIRECTIONAL);
}
+#endif
}
/* allocate pages from VRAM carveout, used when no IOMMU: */
--
2.21.0
next prev parent reply other threads:[~2019-08-05 21:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 21:14 [PATCH 1/2] drm: add cache support for arm64 Rob Clark
2019-08-05 21:14 ` Rob Clark [this message]
2019-08-06 8:48 ` Christoph Hellwig
2019-08-06 9:38 ` Daniel Vetter
2019-08-06 11:38 ` Christoph Hellwig
2019-08-06 14:11 ` Rob Clark
2019-08-06 14:34 ` Mark Rutland
2019-08-06 16:31 ` Rob Clark
2019-08-07 12:38 ` Mark Rutland
2019-08-07 16:15 ` Rob Clark
2019-08-07 16:49 ` Mark Rutland
2019-08-07 17:30 ` Rob Clark
2019-08-08 7:59 ` Christoph Hellwig
2019-08-08 16:44 ` Rob Clark
2019-08-09 8:18 ` Christoph Hellwig
2019-08-08 7:58 ` Christoph Hellwig
2019-08-08 10:20 ` Mark Rutland
2019-08-08 10:24 ` Mark Rutland
2019-08-08 10:32 ` Will Deacon
2019-08-08 7:53 ` Christoph Hellwig
2019-08-06 15:50 ` Christoph Hellwig
2019-08-06 16:23 ` Rob Clark
2019-08-06 16:26 ` Rob Clark
2019-08-07 6:25 ` Christoph Hellwig
2019-08-07 8:48 ` Daniel Vetter
2019-08-08 9:55 ` Christoph Hellwig
2019-08-08 11:58 ` Daniel Vetter
2019-08-09 8:14 ` Christoph Hellwig
2019-08-07 16:09 ` Rob Clark
2019-08-08 10:00 ` Christoph Hellwig
2019-08-08 16:32 ` Rob Clark
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190805211451.20176-2-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=hch@lst.de \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@chromium.org \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).