[PATCH 4/4] drm/dev: Remove drm_dev_init

[Thomas Zimmermann]

Am 18.09.20 um 15:25 schrieb Daniel Vetter:
> We can now also delete drm_dev_init, now that vkms, vgem and i915
> selftests are resolved.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

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

> ---
>  drivers/gpu/drm/drm_drv.c      | 41 +++-------------------------------
>  drivers/gpu/drm/drm_internal.h |  1 +
>  drivers/gpu/drm/drm_managed.c  | 13 -----------
>  include/drm/drm_drv.h          |  4 ----
>  4 files changed, 4 insertions(+), 55 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 7c1689842ec0..457ac0f82be2 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -573,43 +573,9 @@ static void drm_dev_init_release(struct drm_device *dev, void *res)
>  	drm_legacy_destroy_members(dev);
>  }
>  
> -/**
> - * drm_dev_init - Initialise new DRM device
> - * @dev: DRM device
> - * @driver: DRM driver
> - * @parent: Parent device object
> - *
> - * Initialize a new DRM device. No device registration is done.
> - * Call drm_dev_register() to advertice the device to user space and register it
> - * with other core subsystems. This should be done last in the device
> - * initialization sequence to make sure userspace can't access an inconsistent
> - * state.
> - *
> - * The initial ref-count of the object is 1. Use drm_dev_get() and
> - * drm_dev_put() to take and drop further ref-counts.
> - *
> - * It is recommended that drivers embed &struct drm_device into their own device
> - * structure.
> - *
> - * Drivers that do not want to allocate their own device struct
> - * embedding &struct drm_device can call drm_dev_alloc() instead. For drivers
> - * that do embed &struct drm_device it must be placed first in the overall
> - * structure, and the overall structure must be allocated using kmalloc(): The
> - * drm core's release function unconditionally calls kfree() on the @dev pointer
> - * when the final reference is released. To override this behaviour, and so
> - * allow embedding of the drm_device inside the driver's device struct at an
> - * arbitrary offset, you must supply a &drm_driver.release callback and control
> - * the finalization explicitly.
> - *
> - * Note that drivers must call drmm_add_final_kfree() after this function has
> - * completed successfully.
> - *
> - * RETURNS:
> - * 0 on success, or error code on failure.
> - */
> -int drm_dev_init(struct drm_device *dev,
> -		 struct drm_driver *driver,
> -		 struct device *parent)
> +static int drm_dev_init(struct drm_device *dev,
> +			struct drm_driver *driver,
> +			struct device *parent)
>  {
>  	int ret;
>  
> @@ -689,7 +655,6 @@ int drm_dev_init(struct drm_device *dev,
>  
>  	return ret;
>  }
> -EXPORT_SYMBOL(drm_dev_init);
>  
>  static void devm_drm_dev_init_release(void *data)
>  {
> diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
> index 8e01caaf95cc..b65865c630b0 100644
> --- a/drivers/gpu/drm/drm_internal.h
> +++ b/drivers/gpu/drm/drm_internal.h
> @@ -95,6 +95,7 @@ void drm_minor_release(struct drm_minor *minor);
>  
>  /* drm_managed.c */
>  void drm_managed_release(struct drm_device *dev);
> +void drmm_add_final_kfree(struct drm_device *dev, void *container);
>  
>  /* drm_vblank.c */
>  static inline bool drm_vblank_passed(u64 seq, u64 ref)
> diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c
> index c36e3d98fd71..37d7db6223be 100644
> --- a/drivers/gpu/drm/drm_managed.c
> +++ b/drivers/gpu/drm/drm_managed.c
> @@ -125,18 +125,6 @@ static void add_dr(struct drm_device *dev, struct drmres *dr)
>  		       dr, dr->node.name, (unsigned long) dr->node.size);
>  }
>  
> -/**
> - * drmm_add_final_kfree - add release action for the final kfree()
> - * @dev: DRM device
> - * @container: pointer to the kmalloc allocation containing @dev
> - *
> - * Since the allocation containing the struct &drm_device must be allocated
> - * before it can be initialized with drm_dev_init() there's no way to allocate
> - * that memory with drmm_kmalloc(). To side-step this chicken-egg problem the
> - * pointer for this final kfree() must be specified by calling this function. It
> - * will be released in the final drm_dev_put() for @dev, after all other release
> - * actions installed through drmm_add_action() have been processed.
> - */
>  void drmm_add_final_kfree(struct drm_device *dev, void *container)
>  {
>  	WARN_ON(dev->managed.final_kfree);
> @@ -144,7 +132,6 @@ void drmm_add_final_kfree(struct drm_device *dev, void *container)
>  	WARN_ON(dev + 1 > (struct drm_device *) (container + ksize(container)));
>  	dev->managed.final_kfree = container;
>  }
> -EXPORT_SYMBOL(drmm_add_final_kfree);
>  
>  int __drmm_add_action(struct drm_device *dev,
>  		      drmres_release_t action,
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index 533c6e1a5a95..b8ce9147c9a6 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -591,10 +591,6 @@ struct drm_driver {
>  	int dev_priv_size;
>  };
>  
> -int drm_dev_init(struct drm_device *dev,
> -		 struct drm_driver *driver,
> -		 struct device *parent);
> -
>  void *__devm_drm_dev_alloc(struct device *parent, struct drm_driver *driver,
>  			   size_t size, size_t offset);
>  
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 516 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20200918/97830054/attachment.sig>