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 <ch...@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.vet...@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-de...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
