From: Daniel Vetter <daniel@ffwll.ch>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 2/2] drm/vgem: Replace opencoded version of drm_gem_dumb_map_offset()
Date: Wed, 8 Jul 2020 11:56:19 +0200 [thread overview]
Message-ID: <20200708095619.GK3278063@phenom.ffwll.local> (raw)
In-Reply-To: <20200707160012.1299338-2-chris@chris-wilson.co.uk>
On Tue, Jul 07, 2020 at 05:00:12PM +0100, Chris Wilson wrote:
> drm_gem_dumb_map_offset() now exists and does everything
> vgem_gem_dump_map does and *ought* to do.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> drivers/gpu/drm/vgem/vgem_drv.c | 28 +---------------------------
> 1 file changed, 1 insertion(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
> index eb3b7cdac941..866cff537f28 100644
> --- a/drivers/gpu/drm/vgem/vgem_drv.c
> +++ b/drivers/gpu/drm/vgem/vgem_drv.c
> @@ -236,32 +236,6 @@ static int vgem_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
> return 0;
> }
>
> -static int vgem_gem_dumb_map(struct drm_file *file, struct drm_device *dev,
> - uint32_t handle, uint64_t *offset)
> -{
> - struct drm_gem_object *obj;
> - int ret;
> -
> - obj = drm_gem_object_lookup(file, handle);
> - if (!obj)
> - return -ENOENT;
> -
> - if (!obj->filp) {
> - ret = -EINVAL;
> - goto unref;
> - }
> -
> - ret = drm_gem_create_mmap_offset(obj);
> - if (ret)
> - goto unref;
> -
> - *offset = drm_vma_node_offset_addr(&obj->vma_node);
> -unref:
> - drm_gem_object_put_unlocked(obj);
> -
> - return ret;
> -}
> -
> static struct drm_ioctl_desc vgem_ioctls[] = {
> DRM_IOCTL_DEF_DRV(VGEM_FENCE_ATTACH, vgem_fence_attach_ioctl, DRM_RENDER_ALLOW),
> DRM_IOCTL_DEF_DRV(VGEM_FENCE_SIGNAL, vgem_fence_signal_ioctl, DRM_RENDER_ALLOW),
> @@ -455,7 +429,7 @@ static struct drm_driver vgem_driver = {
> .fops = &vgem_driver_fops,
>
> .dumb_create = vgem_gem_dumb_create,
> - .dumb_map_offset = vgem_gem_dumb_map,
> + .dumb_map_offset = drm_gem_dumb_map_offset,
Even better: Just delete it, it's the default. With that:
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Also maybe cc: stable, since this should stop the mmap attempts on
imported dma-buf? Or will this break stuff ...
-Daniel
>
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> --
> 2.27.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-08 9:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 16:00 [PATCH 1/2] drm/vgem: Do not allocate backing shmemfs file for an import dmabuf object Chris Wilson
2020-07-07 16:00 ` [PATCH 2/2] drm/vgem: Replace opencoded version of drm_gem_dumb_map_offset() Chris Wilson
2020-07-08 9:56 ` Daniel Vetter [this message]
2020-07-08 14:53 ` Chris Wilson
2020-07-07 17:05 ` [PATCH 1/2] drm/vgem: Do not allocate backing shmemfs file for an import dmabuf object lepton
2020-07-07 17:20 ` Chris Wilson
2020-07-07 18:17 ` lepton
2020-07-07 18:35 ` Chris Wilson
2020-07-08 9:22 ` Christian König
2020-07-08 9:54 ` Daniel Vetter
2020-07-08 14:37 ` Christian König
2020-07-08 15:01 ` Daniel Vetter
2020-07-08 15:05 ` Christian König
2020-07-08 16:11 ` Daniel Vetter
2020-07-08 16:19 ` Daniel Vetter
2020-07-09 8:48 ` Christian König
2020-07-09 13:54 ` Steven Price
2020-07-09 14:15 ` Christian König
2020-07-09 8:49 ` Christian König
2020-07-08 5:44 ` lepton
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=20200708095619.GK3278063@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=chris@chris-wilson.co.uk \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/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).