From: Rob Herring <robh@kernel.org>
To: dri-devel@lists.freedesktop.org
Cc: "Heiko Stübner" <heiko@sntech.de>,
"Neil Armstrong" <narmstrong@baylibre.com>,
"David Airlie" <airlied@linux.ie>,
"Liviu Dudau" <liviu.dudau@arm.com>,
"Sandy Huang" <hjc@rock-chips.com>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
"Benjamin Gaignard" <benjamin.gaignard@linaro.org>,
"Yannick Fertre" <yannick.fertre@st.com>,
"Kevin Hilman" <khilman@baylibre.com>,
"Xinwei Kong" <kong.kongxinwei@hisilicon.com>,
"Xinliang Liu" <z.liuxinliang@hisilicon.com>,
linux-rockchip@lists.infradead.org,
"Chen-Yu Tsai" <wens@csie.org>,
"Noralf Trønnes" <noralf@tronnes.org>,
"James (Qian) Wang" <james.qian.wang@arm.com>,
"CK Hu" <ck.hu@mediatek.com>,
"Philipp Zabel" <p.zabel@pengutronix.de>,
"Alexandre Torgue" <alexandre.torgue@st.com>,
"Chen Feng" <puck.chen@hisilicon.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
linux-mediatek@lists.infradead.org,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>, "Sean Paul" <sean@poorly.run>,
linux-arm-kernel@lists.infradead.org,
"Philippe Cornu" <philippe.cornu@st.com>,
"Vincent Abriou" <vincent.abriou@st.com>,
"Kieran Bingham" <kieran.bingham+renesas@ideasonboard.com>,
"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
"Rongrong Zou" <zourongrong@gmail.com>
Subject: [PATCH 3/6] drm/cma-helper: Use the dma_*_attr API variant
Date: Mon, 21 Oct 2019 16:45:47 -0500 [thread overview]
Message-ID: <20191021214550.1461-4-robh@kernel.org> (raw)
In-Reply-To: <20191021214550.1461-1-robh@kernel.org>
In preparation to allow DRM CMA users to adjust the DMA_ATTR_* flags,
convert the CMA helper code to use the dma_*_attr APIs instead of the
dma_*_wc variants.
Only the DMA_ATTR_WRITE_COMBINE and DMA_ATTR_NO_WARN attributes are set
in this commit, so there's no functional change.
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/gpu/drm/drm_gem_cma_helper.c | 20 ++++++++++++--------
include/drm/drm_gem_cma_helper.h | 1 +
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index 12e98fb28229..4cebfe01e6ea 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -70,6 +70,7 @@ __drm_gem_cma_create(struct drm_device *drm, size_t size)
goto error;
}
+ cma_obj->dma_attrs |= DMA_ATTR_NO_WARN | DMA_ATTR_WRITE_COMBINE;
return cma_obj;
error:
@@ -102,8 +103,9 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,
if (IS_ERR(cma_obj))
return cma_obj;
- cma_obj->vaddr = dma_alloc_wc(drm->dev, size, &cma_obj->paddr,
- GFP_KERNEL | __GFP_NOWARN);
+ cma_obj->vaddr = dma_alloc_attrs(drm->dev, size, &cma_obj->paddr,
+ GFP_KERNEL | __GFP_NOWARN,
+ cma_obj->dma_attrs);
if (!cma_obj->vaddr) {
dev_dbg(drm->dev, "failed to allocate buffer with size %zu\n",
size);
@@ -184,8 +186,9 @@ void drm_gem_cma_free_object(struct drm_gem_object *gem_obj)
dma_buf_vunmap(gem_obj->import_attach->dmabuf, cma_obj->vaddr);
drm_prime_gem_destroy(gem_obj, cma_obj->sgt);
} else if (cma_obj->vaddr) {
- dma_free_wc(gem_obj->dev->dev, cma_obj->base.size,
- cma_obj->vaddr, cma_obj->paddr);
+ dma_free_attrs(gem_obj->dev->dev, cma_obj->base.size,
+ cma_obj->vaddr, cma_obj->paddr,
+ cma_obj->dma_attrs);
}
drm_gem_object_release(gem_obj);
@@ -279,8 +282,9 @@ static int drm_gem_cma_mmap_obj(struct drm_gem_cma_object *cma_obj,
vma->vm_flags &= ~VM_PFNMAP;
vma->vm_pgoff = 0;
- ret = dma_mmap_wc(cma_obj->base.dev->dev, vma, cma_obj->vaddr,
- cma_obj->paddr, vma->vm_end - vma->vm_start);
+ ret = dma_mmap_attrs(cma_obj->base.dev->dev, vma, cma_obj->vaddr,
+ cma_obj->paddr, vma->vm_end - vma->vm_start,
+ cma_obj->dma_attrs);
if (ret)
drm_gem_vm_close(vma);
@@ -434,8 +438,8 @@ struct sg_table *drm_gem_cma_prime_get_sg_table(struct drm_gem_object *obj)
if (!sgt)
return ERR_PTR(-ENOMEM);
- ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr,
- cma_obj->paddr, obj->size);
+ ret = dma_get_sgtable_attrs(obj->dev->dev, sgt, cma_obj->vaddr,
+ cma_obj->paddr, obj->size, cma_obj->dma_attrs);
if (ret < 0)
goto out;
diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h
index 947ac95eb24a..d042213c3595 100644
--- a/include/drm/drm_gem_cma_helper.h
+++ b/include/drm/drm_gem_cma_helper.h
@@ -24,6 +24,7 @@ struct drm_gem_cma_object {
/* For objects with DMA memory allocated by GEM CMA */
void *vaddr;
+ unsigned long dma_attrs;
};
#define to_drm_gem_cma_obj(gem_obj) \
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-21 21:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 21:45 [PATCH 0/6] drm: Support CMA per allocation kernel mappings Rob Herring
2019-10-21 21:45 ` [PATCH 1/6] drm/kirin: Use DRM_GEM_CMA_VMAP_DRIVER_OPS Rob Herring
2019-10-21 21:45 ` [PATCH 2/6] drm: Introduce DRM_MODE_DUMB_KERNEL_MAP flag Rob Herring
2019-10-22 11:14 ` Laurent Pinchart
2019-10-22 12:42 ` Rob Herring
2019-10-23 14:28 ` Laurent Pinchart
2019-10-23 17:03 ` Rob Herring
2019-10-21 21:45 ` Rob Herring [this message]
2019-10-22 1:01 ` [PATCH 3/6] drm/cma-helper: Use the dma_*_attr API variant kbuild test robot
2019-10-22 11:18 ` Laurent Pinchart
2019-10-21 21:45 ` [PATCH 4/6] drm/cma-helper: Support DRM_MODE_DUMB_KERNEL_MAP flag Rob Herring
2019-10-22 6:13 ` james qian wang (Arm Technology China)
2019-10-22 7:50 ` Neil Armstrong
2019-10-22 11:30 ` Laurent Pinchart
2019-10-22 11:40 ` Geert Uytterhoeven
2019-10-22 19:52 ` Rob Herring
2019-10-22 20:02 ` Rob Herring
2019-10-23 14:27 ` Laurent Pinchart
2019-10-21 21:45 ` [PATCH 5/6] drm/mediatek: Convert to use CMA helpers Rob Herring
2019-10-22 17:07 ` Matthias Brugger
2019-10-23 17:42 ` Rob Herring
2019-10-23 21:06 ` CK Hu
2019-10-23 22:56 ` Rob Herring
2019-10-24 7:02 ` CK Hu
2019-12-17 1:12 ` Laurent Pinchart
2019-10-21 21:45 ` [PATCH 6/6] drm/rockchip: Convert to use generic fbdev emulation Rob Herring
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=20191021214550.1461-4-robh@kernel.org \
--to=robh@kernel.org \
--cc=airlied@linux.ie \
--cc=alexandre.torgue@st.com \
--cc=benjamin.gaignard@linaro.org \
--cc=ck.hu@mediatek.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=james.qian.wang@arm.com \
--cc=khilman@baylibre.com \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=kong.kongxinwei@hisilicon.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=liviu.dudau@arm.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matthias.bgg@gmail.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=mripard@kernel.org \
--cc=narmstrong@baylibre.com \
--cc=noralf@tronnes.org \
--cc=p.zabel@pengutronix.de \
--cc=philippe.cornu@st.com \
--cc=puck.chen@hisilicon.com \
--cc=sean@poorly.run \
--cc=vincent.abriou@st.com \
--cc=wens@csie.org \
--cc=yannick.fertre@st.com \
--cc=z.liuxinliang@hisilicon.com \
--cc=zourongrong@gmail.com \
/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).