[PATCH v2 17/19] drm/armada: Use the drm_driver.dumb_destroy default

[Daniel Vetter]

On Sun, Aug 06, 2017 at 05:41:06PM +0200, Noralf Trønnes wrote:
> armada_gem_dumb_destroy() is the same as drm_gem_dumb_destroy()
> which is the drm_driver.dumb_destroy default, so no need to set it.
> 
> Cc: Russell King <linux at armlinux.org.uk>
> Signed-off-by: Noralf Trønnes <noralf at tronnes.org>
> ---
>  drivers/gpu/drm/armada/armada_drv.c | 1 -
>  drivers/gpu/drm/armada/armada_gem.c | 6 ------
>  drivers/gpu/drm/armada/armada_gem.h | 2 --
>  3 files changed, 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
> index 0b3227c..8a37b9a 100644
> --- a/drivers/gpu/drm/armada/armada_drv.c
> +++ b/drivers/gpu/drm/armada/armada_drv.c
> @@ -71,7 +71,6 @@ static struct drm_driver armada_drm_driver = {
>  	.gem_prime_import	= armada_gem_prime_import,
>  	.dumb_create		= armada_gem_dumb_create,
>  	.dumb_map_offset	= armada_gem_dumb_map_offset,

Looking at this I noticed how we reject the mapping of imported dma-bufs
in the dumb ioctl. I think that's a pretty good idea to do in generic code
(it is an invalid use-case). If we'd put that check into the core helpers,
we could also switch the armada dumb_map_offset to the generic one.
-Daniel

> -	.dumb_destroy		= armada_gem_dumb_destroy,
>  	.gem_vm_ops		= &armada_gem_vm_ops,
>  	.major			= 1,
>  	.minor			= 0,
> diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
> index a76ca21..9d69132 100644
> --- a/drivers/gpu/drm/armada/armada_gem.c
> +++ b/drivers/gpu/drm/armada/armada_gem.c
> @@ -300,12 +300,6 @@ int armada_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
>  	return ret;
>  }
>  
> -int armada_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
> -	uint32_t handle)
> -{
> -	return drm_gem_handle_delete(file, handle);
> -}
> -
>  /* Private driver gem ioctls */
>  int armada_gem_create_ioctl(struct drm_device *dev, void *data,
>  	struct drm_file *file)
> diff --git a/drivers/gpu/drm/armada/armada_gem.h b/drivers/gpu/drm/armada/armada_gem.h
> index 6e524e0..78d5690 100644
> --- a/drivers/gpu/drm/armada/armada_gem.h
> +++ b/drivers/gpu/drm/armada/armada_gem.h
> @@ -37,8 +37,6 @@ int armada_gem_dumb_create(struct drm_file *, struct drm_device *,
>  	struct drm_mode_create_dumb *);
>  int armada_gem_dumb_map_offset(struct drm_file *, struct drm_device *,
>  	uint32_t, uint64_t *);
> -int armada_gem_dumb_destroy(struct drm_file *, struct drm_device *,
> -	uint32_t);
>  struct dma_buf *armada_gem_prime_export(struct drm_device *dev,
>  	struct drm_gem_object *obj, int flags);
>  struct drm_gem_object *armada_gem_prime_import(struct drm_device *,
> -- 
> 2.7.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch