[PATCH 1/2] drm: armada: Remove custom .dumb_destroy() handler

[Daniel Vetter]

On Fri, Sep 15, 2017 at 09:17:53PM +0300, Laurent Pinchart wrote:
> Hi Noralf,
> 
> On Friday, 15 September 2017 20:49:26 EEST Noralf Trønnes wrote:
> > Den 15.09.2017 04.27, skrev Laurent Pinchart:
> > > The custom implementation just calls drm_gem_handle_delete(), which is
> > > identical to the default implementation used when the operation handler
> > > isn't set. Remove it.
> > > 
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas at ideasonboard.com>
> > > ---
> > 
> > This is done already:
> > drm/armada: Use .dumb_map_offset and .dumb_destroy defaults
> > https://cgit.freedesktop.org/drm/drm-misc/commit/?id=4ee73624e0d0fd647ede3b1
> > 7187ba98f2aa9421c
> > 
> > It stalled for some time awaiting the outcome of this:
> > drm/gem: drm_gem_dumb_map_offset(): reject dma-buf
> > https://cgit.freedesktop.org/drm/drm-misc/commit/?id=90378e58919285637aa0f06
> > 3c04ba0c6449d98b1
> 
> Oops, sorry about that.
> 
> Should we push the former as it doesn't depend on the latter ?

Needs acks and r-bs ... hint, hint :-)
-Daniel

> 
> > >   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 0b3227c039d7..8a37b9a66dbc
> > > 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,
> > > 
> > > -	.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 a76ca21d063b..9d69132bbeda
> > > 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 6e524e0676bb..78d5690b699b
> > > 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 *,
> 
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> 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