From: Daniel Vetter <daniel@ffwll.ch>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: luben.tuikov@amd.com, heiko@sntech.de, airlied@linux.ie,
nouveau@lists.freedesktop.org, linus.walleij@linaro.org,
dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk,
melissa.srw@gmail.com, eric@anholt.net, ray.huang@amd.com,
kraxel@redhat.com, sam@ravnborg.org, sumit.semwal@linaro.org,
emil.velikov@collabora.com, robh@kernel.org,
linux-samsung-soc@vger.kernel.org, jy0922.shim@samsung.com,
lima@lists.freedesktop.org, oleksandr_andrushchenko@epam.com,
krzk@kernel.org, steven.price@arm.com,
linux-rockchip@lists.infradead.org, kgene@kernel.org,
bskeggs@redhat.com, linux+etnaviv@armlinux.org.uk,
spice-devel@lists.freedesktop.org,
alyssa.rosenzweig@collabora.com,
maarten.lankhorst@linux.intel.com, etnaviv@lists.freedesktop.org,
mripard@kernel.org, inki.dae@samsung.com, hdegoede@redhat.com,
christian.gmeiner@gmail.com, xen-devel@lists.xenproject.org,
virtualization@lists.linux-foundation.org, sean@poorly.run,
apaneers@amd.com, linux-arm-kernel@lists.infradead.org,
linaro-mm-sig@lists.linaro.org, amd-gfx@lists.freedesktop.org,
tomeu.vizoso@collabora.com, sw0312.kim@samsung.com,
hjc@rock-chips.com, kyungmin.park@samsung.com,
miaoqinglang@huawei.com, yuq825@gmail.com, daniel@ffwll.ch,
alexander.deucher@amd.com, linux-media@vger.kernel.org,
christian.koenig@amd.com, l.stach@pengutronix.de
Subject: Re: [PATCH v3 4/7] drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map
Date: Fri, 2 Oct 2020 15:04:40 +0200 [thread overview]
Message-ID: <20201002130440.GK438822@phenom.ffwll.local> (raw)
In-Reply-To: <20200929151437.19717-5-tzimmermann@suse.de>
On Tue, Sep 29, 2020 at 05:14:34PM +0200, Thomas Zimmermann wrote:
> GEM's vmap and vunmap interfaces now wrap memory pointers in struct
> dma_buf_map.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/drm_client.c | 18 +++++++++++-------
> drivers/gpu/drm/drm_gem.c | 28 ++++++++++++++--------------
> drivers/gpu/drm/drm_internal.h | 5 +++--
> drivers/gpu/drm/drm_prime.c | 14 ++++----------
> 4 files changed, 32 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
> index 495f47d23d87..ac0082bed966 100644
> --- a/drivers/gpu/drm/drm_client.c
> +++ b/drivers/gpu/drm/drm_client.c
> @@ -3,6 +3,7 @@
> * Copyright 2018 Noralf Trønnes
> */
>
> +#include <linux/dma-buf-map.h>
> #include <linux/list.h>
> #include <linux/module.h>
> #include <linux/mutex.h>
> @@ -304,7 +305,8 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u
> */
> void *drm_client_buffer_vmap(struct drm_client_buffer *buffer)
> {
> - void *vaddr;
> + struct dma_buf_map map;
> + int ret;
>
> if (buffer->vaddr)
> return buffer->vaddr;
> @@ -317,13 +319,13 @@ void *drm_client_buffer_vmap(struct drm_client_buffer *buffer)
> * fd_install step out of the driver backend hooks, to make that
> * final step optional for internal users.
> */
> - vaddr = drm_gem_vmap(buffer->gem);
> - if (IS_ERR(vaddr))
> - return vaddr;
> + ret = drm_gem_vmap(buffer->gem, &map);
> + if (ret)
> + return ERR_PTR(ret);
>
> - buffer->vaddr = vaddr;
> + buffer->vaddr = map.vaddr;
>
> - return vaddr;
> + return map.vaddr;
> }
> EXPORT_SYMBOL(drm_client_buffer_vmap);
>
> @@ -337,7 +339,9 @@ EXPORT_SYMBOL(drm_client_buffer_vmap);
> */
> void drm_client_buffer_vunmap(struct drm_client_buffer *buffer)
> {
> - drm_gem_vunmap(buffer->gem, buffer->vaddr);
> + struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(buffer->vaddr);
> +
> + drm_gem_vunmap(buffer->gem, &map);
> buffer->vaddr = NULL;
> }
> EXPORT_SYMBOL(drm_client_buffer_vunmap);
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index 0c4a66dea5c2..f2b2f37d41c4 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -1205,32 +1205,32 @@ void drm_gem_unpin(struct drm_gem_object *obj)
> obj->funcs->unpin(obj);
> }
>
> -void *drm_gem_vmap(struct drm_gem_object *obj)
> +int drm_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
> {
> - struct dma_buf_map map;
> int ret;
>
> - if (!obj->funcs->vmap) {
> - return ERR_PTR(-EOPNOTSUPP);
> + if (!obj->funcs->vmap)
> + return -EOPNOTSUPP;
>
> - ret = obj->funcs->vmap(obj, &map);
> + ret = obj->funcs->vmap(obj, map);
> if (ret)
> - return ERR_PTR(ret);
> - else if (dma_buf_map_is_null(&map))
> - return ERR_PTR(-ENOMEM);
> + return ret;
> + else if (dma_buf_map_is_null(map))
> + return -ENOMEM;
>
> - return map.vaddr;
> + return 0;
> }
>
> -void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr)
> +void drm_gem_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map)
> {
> - struct dma_buf_map map = DMA_BUF_MAP_INIT_VADDR(vaddr);
> -
> - if (!vaddr)
> + if (dma_buf_map_is_null(map))
> return;
>
> if (obj->funcs->vunmap)
> - obj->funcs->vunmap(obj, &map);
> + obj->funcs->vunmap(obj, map);
> +
> + /* Always set the mapping to NULL. Callers may rely on this. */
> + dma_buf_map_clear(map);
> }
>
> /**
> diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
> index b65865c630b0..58832d75a9bd 100644
> --- a/drivers/gpu/drm/drm_internal.h
> +++ b/drivers/gpu/drm/drm_internal.h
> @@ -33,6 +33,7 @@
>
> struct dentry;
> struct dma_buf;
> +struct dma_buf_map;
> struct drm_connector;
> struct drm_crtc;
> struct drm_framebuffer;
> @@ -187,8 +188,8 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent,
>
> int drm_gem_pin(struct drm_gem_object *obj);
> void drm_gem_unpin(struct drm_gem_object *obj);
> -void *drm_gem_vmap(struct drm_gem_object *obj);
> -void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr);
> +int drm_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map);
> +void drm_gem_vunmap(struct drm_gem_object *obj, struct dma_buf_map *map);
>
> /* drm_debugfs.c drm_debugfs_crc.c */
> #if defined(CONFIG_DEBUG_FS)
> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
> index 89e2a2496734..cb8fbeeb731b 100644
> --- a/drivers/gpu/drm/drm_prime.c
> +++ b/drivers/gpu/drm/drm_prime.c
> @@ -667,21 +667,15 @@ EXPORT_SYMBOL(drm_gem_unmap_dma_buf);
> *
> * Sets up a kernel virtual mapping. This can be used as the &dma_buf_ops.vmap
> * callback. Calls into &drm_gem_object_funcs.vmap for device specific handling.
> + * The kernel virtual address is returned in map.
> *
> - * Returns the kernel virtual address or NULL on failure.
> + * Returns 0 on success or a negative errno code otherwise.
> */
> int drm_gem_dmabuf_vmap(struct dma_buf *dma_buf, struct dma_buf_map *map)
> {
> struct drm_gem_object *obj = dma_buf->priv;
> - void *vaddr;
>
> - vaddr = drm_gem_vmap(obj);
> - if (IS_ERR(vaddr))
> - return PTR_ERR(vaddr);
> -
> - dma_buf_map_set_vaddr(map, vaddr);
> -
> - return 0;
> + return drm_gem_vmap(obj, map);
> }
> EXPORT_SYMBOL(drm_gem_dmabuf_vmap);
>
> @@ -697,7 +691,7 @@ void drm_gem_dmabuf_vunmap(struct dma_buf *dma_buf, struct dma_buf_map *map)
> {
> struct drm_gem_object *obj = dma_buf->priv;
>
> - drm_gem_vunmap(obj, map->vaddr);
> + drm_gem_vunmap(obj, map);
> }
> EXPORT_SYMBOL(drm_gem_dmabuf_vunmap);
Some of the transitional stuff disappearing!
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> --
> 2.28.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2020-10-02 13:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 15:14 [PATCH v3 0/7] Support GEM object mappings from I/O memory Thomas Zimmermann
2020-09-29 15:14 ` [PATCH v3 1/7] drm/vram-helper: Remove invariant parameters from internal kmap function Thomas Zimmermann
2020-10-02 9:48 ` Daniel Vetter
2020-09-29 15:14 ` [PATCH v3 2/7] drm/ttm: Add ttm_kmap_obj_to_dma_buf_map() for type conversion Thomas Zimmermann
2020-09-29 15:35 ` Christian König
2020-09-29 15:44 ` Daniel Vetter
2020-09-29 17:49 ` Thomas Zimmermann
[not found] ` <8a84f62b-33f3-f44c-52af-c859a0e0d1fb@gmail.com>
2020-09-30 8:19 ` Thomas Zimmermann
[not found] ` <b569b7e3-68f0-edcc-c8f4-170e9042d348@gmail.com>
2020-09-30 9:47 ` Daniel Vetter
2020-09-30 12:34 ` Christian König
2020-09-30 12:51 ` Daniel Vetter
2020-10-02 9:58 ` Daniel Vetter
2020-10-02 11:30 ` Christian König
2020-10-02 12:21 ` Daniel Vetter
2020-10-07 12:57 ` Thomas Zimmermann
2020-10-07 13:10 ` Daniel Vetter
2020-10-07 13:20 ` Thomas Zimmermann
2020-10-07 13:24 ` Christian König
2020-10-07 14:30 ` Daniel Vetter
2020-10-08 9:00 ` Thomas Zimmermann
2020-09-29 15:14 ` [PATCH v3 3/7] drm/gem: Use struct dma_buf_map in GEM vmap ops and convert GEM backends Thomas Zimmermann
2020-10-02 13:02 ` Daniel Vetter
2020-09-29 15:14 ` [PATCH v3 4/7] drm/gem: Update internal GEM vmap/vunmap interfaces to use struct dma_buf_map Thomas Zimmermann
2020-10-02 13:04 ` Daniel Vetter [this message]
2020-09-29 15:14 ` [PATCH v3 5/7] drm/gem: Store client buffer mappings as " Thomas Zimmermann
2020-10-02 13:05 ` Daniel Vetter
2020-09-29 15:14 ` [PATCH v3 6/7] drm/fb_helper: Support framebuffers in I/O memory Thomas Zimmermann
2020-10-02 18:05 ` Daniel Vetter
2020-10-02 18:44 ` Daniel Vetter
2020-10-08 9:25 ` Thomas Zimmermann
2020-10-08 9:35 ` Daniel Vetter
2020-09-29 15:14 ` [PATCH v3 7/7] drm/todo: Update entries around struct dma_buf_map Thomas Zimmermann
2020-10-02 18:45 ` Daniel Vetter
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=20201002130440.GK438822@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=alyssa.rosenzweig@collabora.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=apaneers@amd.com \
--cc=bskeggs@redhat.com \
--cc=chris@chris-wilson.co.uk \
--cc=christian.gmeiner@gmail.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.velikov@collabora.com \
--cc=eric@anholt.net \
--cc=etnaviv@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=inki.dae@samsung.com \
--cc=jy0922.shim@samsung.com \
--cc=kgene@kernel.org \
--cc=kraxel@redhat.com \
--cc=krzk@kernel.org \
--cc=kyungmin.park@samsung.com \
--cc=l.stach@pengutronix.de \
--cc=lima@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux+etnaviv@armlinux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=luben.tuikov@amd.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=melissa.srw@gmail.com \
--cc=miaoqinglang@huawei.com \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=oleksandr_andrushchenko@epam.com \
--cc=ray.huang@amd.com \
--cc=robh@kernel.org \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
--cc=spice-devel@lists.freedesktop.org \
--cc=steven.price@arm.com \
--cc=sumit.semwal@linaro.org \
--cc=sw0312.kim@samsung.com \
--cc=tomeu.vizoso@collabora.com \
--cc=tzimmermann@suse.de \
--cc=virtualization@lists.linux-foundation.org \
--cc=xen-devel@lists.xenproject.org \
--cc=yuq825@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).