diff mbox series

[2/2] drm: remove dumb_destroy callback

Message ID 20230126102814.8722-2-christian.koenig@amd.com (mailing list archive)
State New, archived
Headers show
Series [1/2] drm/client: fix circular reference counting issue | expand

Commit Message

Christian König Jan. 26, 2023, 10:28 a.m. UTC 
Not used by any driver any more.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/drm_dumb_buffers.c |  5 +----
 drivers/gpu/drm/drm_gem.c          |  7 -------
 drivers/gpu/drm/drm_internal.h     |  3 ---
 include/drm/drm_drv.h              | 19 -------------------
 4 files changed, 1 insertion(+), 33 deletions(-)

Comments

Thomas Zimmermann Jan. 26, 2023, 2:32 p.m. UTC | #1 
Am 26.01.23 um 11:28 schrieb Christian König:
> Not used by any driver any more.
> 
> Signed-off-by: Christian König <christian.koenig@amd.com>

Same comments as for patch 1.

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>   drivers/gpu/drm/drm_dumb_buffers.c |  5 +----
>   drivers/gpu/drm/drm_gem.c          |  7 -------
>   drivers/gpu/drm/drm_internal.h     |  3 ---
>   include/drm/drm_drv.h              | 19 -------------------
>   4 files changed, 1 insertion(+), 33 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_dumb_buffers.c b/drivers/gpu/drm/drm_dumb_buffers.c
> index ad17fa21cebb..70032bba1c97 100644
> --- a/drivers/gpu/drm/drm_dumb_buffers.c
> +++ b/drivers/gpu/drm/drm_dumb_buffers.c
> @@ -139,10 +139,7 @@ int drm_mode_destroy_dumb(struct drm_device *dev, u32 handle,
>   	if (!dev->driver->dumb_create)
>   		return -ENOSYS;
>   
> -	if (dev->driver->dumb_destroy)
> -		return dev->driver->dumb_destroy(file_priv, dev, handle);
> -	else
> -		return drm_gem_dumb_destroy(file_priv, dev, handle);
> +	return drm_gem_handle_delete(file_priv, handle);
>   }
>   
>   int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index 59a0bb5ebd85..aa15c52ae182 100644
> --- a/drivers/gpu/drm/drm_gem.c
> +++ b/drivers/gpu/drm/drm_gem.c
> @@ -336,13 +336,6 @@ int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
>   }
>   EXPORT_SYMBOL_GPL(drm_gem_dumb_map_offset);
>   
> -int drm_gem_dumb_destroy(struct drm_file *file,
> -			 struct drm_device *dev,
> -			 u32 handle)
> -{
> -	return drm_gem_handle_delete(file, handle);
> -}
> -
>   /**
>    * drm_gem_handle_create_tail - internal functions to create a handle
>    * @file_priv: drm file-private structure to register the handle for
> diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
> index ed2103ee272c..d7e023bbb0d5 100644
> --- a/drivers/gpu/drm/drm_internal.h
> +++ b/drivers/gpu/drm/drm_internal.h
> @@ -178,9 +178,6 @@ void drm_gem_unpin(struct drm_gem_object *obj);
>   int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);
>   void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
>   
> -int drm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
> -			 u32 handle);
> -
>   /* drm_debugfs.c drm_debugfs_crc.c */
>   #if defined(CONFIG_DEBUG_FS)
>   int drm_debugfs_init(struct drm_minor *minor, int minor_id,
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index 1d76d0686b03..5b86bb7603e7 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -400,25 +400,6 @@ struct drm_driver {
>   	int (*dumb_map_offset)(struct drm_file *file_priv,
>   			       struct drm_device *dev, uint32_t handle,
>   			       uint64_t *offset);
> -	/**
> -	 * @dumb_destroy:
> -	 *
> -	 * This destroys the userspace handle for the given dumb backing storage buffer.
> -	 * Since buffer objects must be reference counted in the kernel a buffer object
> -	 * won't be immediately freed if a framebuffer modeset object still uses it.
> -	 *
> -	 * Called by the user via ioctl.
> -	 *
> -	 * The default implementation is drm_gem_dumb_destroy(). GEM based drivers
> -	 * must not overwrite this.
> -	 *
> -	 * Returns:
> -	 *
> -	 * Zero on success, negative errno on failure.
> -	 */
> -	int (*dumb_destroy)(struct drm_file *file_priv,
> -			    struct drm_device *dev,
> -			    uint32_t handle);
>   
>   	/** @major: driver major number */
>   	int major;
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_dumb_buffers.c b/drivers/gpu/drm/drm_dumb_buffers.c
index ad17fa21cebb..70032bba1c97 100644
--- a/drivers/gpu/drm/drm_dumb_buffers.c
+++ b/drivers/gpu/drm/drm_dumb_buffers.c
@@ -139,10 +139,7 @@  int drm_mode_destroy_dumb(struct drm_device *dev, u32 handle,
 	if (!dev->driver->dumb_create)
 		return -ENOSYS;
 
-	if (dev->driver->dumb_destroy)
-		return dev->driver->dumb_destroy(file_priv, dev, handle);
-	else
-		return drm_gem_dumb_destroy(file_priv, dev, handle);
+	return drm_gem_handle_delete(file_priv, handle);
 }
 
 int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 59a0bb5ebd85..aa15c52ae182 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -336,13 +336,6 @@  int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
 }
 EXPORT_SYMBOL_GPL(drm_gem_dumb_map_offset);
 
-int drm_gem_dumb_destroy(struct drm_file *file,
-			 struct drm_device *dev,
-			 u32 handle)
-{
-	return drm_gem_handle_delete(file, handle);
-}
-
 /**
  * drm_gem_handle_create_tail - internal functions to create a handle
  * @file_priv: drm file-private structure to register the handle for
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index ed2103ee272c..d7e023bbb0d5 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -178,9 +178,6 @@  void drm_gem_unpin(struct drm_gem_object *obj);
 int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);
 void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
 
-int drm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
-			 u32 handle);
-
 /* drm_debugfs.c drm_debugfs_crc.c */
 #if defined(CONFIG_DEBUG_FS)
 int drm_debugfs_init(struct drm_minor *minor, int minor_id,
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 1d76d0686b03..5b86bb7603e7 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -400,25 +400,6 @@  struct drm_driver {
 	int (*dumb_map_offset)(struct drm_file *file_priv,
 			       struct drm_device *dev, uint32_t handle,
 			       uint64_t *offset);
-	/**
-	 * @dumb_destroy:
-	 *
-	 * This destroys the userspace handle for the given dumb backing storage buffer.
-	 * Since buffer objects must be reference counted in the kernel a buffer object
-	 * won't be immediately freed if a framebuffer modeset object still uses it.
-	 *
-	 * Called by the user via ioctl.
-	 *
-	 * The default implementation is drm_gem_dumb_destroy(). GEM based drivers
-	 * must not overwrite this.
-	 *
-	 * Returns:
-	 *
-	 * Zero on success, negative errno on failure.
-	 */
-	int (*dumb_destroy)(struct drm_file *file_priv,
-			    struct drm_device *dev,
-			    uint32_t handle);
 
 	/** @major: driver major number */
 	int major;