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

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

[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@ideasonboard.com>
---
 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/2] drm: Don't export the drm_gem_dumb_destroy() function

[Laurent Pinchart]

The drm_gem_dumb_destroy() isn't used in drivers, don't export it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpu/drm/drm_dumb_buffers.c | 7 ++++---
 drivers/gpu/drm/drm_gem.c          | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/drm_dumb_buffers.c b/drivers/gpu/drm/drm_dumb_buffers.c
index 39ac15ce4702..7abf6fd6b52f 100644
--- a/drivers/gpu/drm/drm_dumb_buffers.c
+++ b/drivers/gpu/drm/drm_dumb_buffers.c
@@ -44,9 +44,10 @@
  * KMS frame buffers.
  *
  * To support dumb objects drivers must implement the &drm_driver.dumb_create
- * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if
- * not set and &drm_driver.dumb_map_offset defaults to
- * drm_gem_dumb_map_offset(). See the callbacks for further details.
+ * and &drm_driver.dumb_map_offset operations (the latter defaults to
+ * drm_gem_dumb_map_offset() if not set). Drivers that don't use GEM handles
+ * additionally need to implement the &drm_driver.dumb_destroy operation. See
+ * the callbacks for further details.
  *
  * Note that dumb objects may not be used for gpu acceleration, as has been
  * attempted on some ARM embedded platforms. Such drivers really must have
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index ad4e9cfe48a2..6b23b707b15f 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -360,7 +360,6 @@ int drm_gem_dumb_destroy(struct drm_file *file,
 {
 	return drm_gem_handle_delete(file, handle);
 }
-EXPORT_SYMBOL(drm_gem_dumb_destroy);
 
 /**
  * drm_gem_handle_create_tail - internal functions to create a handle
-- 
Regards,

Laurent Pinchart

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

[Noralf Trønnes]

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@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=4ee73624e0d0fd647ede3b17187ba98f2aa9421c

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=90378e58919285637aa0f063c04ba0c6449d98b1

Noralf.

>   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 *,

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/2] drm: Don't export the drm_gem_dumb_destroy() function

[Noralf Trønnes]

Den 15.09.2017 04.27, skrev Laurent Pinchart:
> The drm_gem_dumb_destroy() isn't used in drivers, don't export it.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>   drivers/gpu/drm/drm_dumb_buffers.c | 7 ++++---
>   drivers/gpu/drm/drm_gem.c          | 1 -
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_dumb_buffers.c b/drivers/gpu/drm/drm_dumb_buffers.c
> index 39ac15ce4702..7abf6fd6b52f 100644
> --- a/drivers/gpu/drm/drm_dumb_buffers.c
> +++ b/drivers/gpu/drm/drm_dumb_buffers.c
> @@ -44,9 +44,10 @@
>    * KMS frame buffers.
>    *
>    * To support dumb objects drivers must implement the &drm_driver.dumb_create
> - * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if
> - * not set and &drm_driver.dumb_map_offset defaults to
> - * drm_gem_dumb_map_offset(). See the callbacks for further details.
> + * and &drm_driver.dumb_map_offset operations (the latter defaults to
> + * drm_gem_dumb_map_offset() if not set). Drivers that don't use GEM handles
> + * additionally need to implement the &drm_driver.dumb_destroy operation. See
> + * the callbacks for further details.
>    *
>    * Note that dumb objects may not be used for gpu acceleration, as has been
>    * attempted on some ARM embedded platforms. Such drivers really must have
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index ad4e9cfe48a2..6b23b707b15f 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -360,7 +360,6 @@ int drm_gem_dumb_destroy(struct drm_file *file,

Maybe drop the docs as well since no one will use it and afaict it's
not linked from anywhere after this patch.

>   {
>   	return drm_gem_handle_delete(file, handle);
>   }
> -EXPORT_SYMBOL(drm_gem_dumb_destroy);
>   

Shouldn't the prototype be moved from include/drm/drm_gem.h to
drivers/gpu/drm/drm_internal.h?

Noralf.


>   /**
>    * drm_gem_handle_create_tail - internal functions to create a handle

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

[Laurent Pinchart]

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@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 ?

> >   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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [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@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@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

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

[Russell King - ARM Linux]

On Wed, Sep 20, 2017 at 08:38:59PM +0200, Daniel Vetter wrote:
> 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@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 :-)

Yea, I also need to get my own patch stack out that moves more of this
code closer to atomic modeset.  I'm not doing very much at the moment
as I'm suffering with a lurgy that's made me very tired and thus
error-prone.

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

[Noralf Trønnes]

Den 20.09.2017 20.38, skrev 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@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 ?

Sorry, I missed this. But what's the former and latter here?

Noralf.

> 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@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

[Noralf Trønnes]

Den 20.09.2017 21.40, skrev Noralf Trønnes:
>
> Den 20.09.2017 20.38, skrev 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@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 ?
>
> Sorry, I missed this. But what's the former and latter here?
>

Oh, now I think I see. I thought former/latter referred to this patchset,
but maybe it refers to the 2 patches I mentioned. I see that I don't
say it explicitly, but they are both applied to drm-misc as implied by
the url's.

Armada came in late compared to the other drivers in the patchset,
since it rejected dma-bufs. So it wasn't clear if it could use both
defaults or just one.

> Noralf.
>
>> 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@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel