[PATCH 48/51] drm/mipi-dbi: Drop explicit drm_mode_config_cleanup call
Sam Ravnborg
sam at ravnborg.org
Fri Feb 28 20:36:20 UTC 2020
On Thu, Feb 27, 2020 at 07:15:19PM +0100, Daniel Vetter wrote:
> Allows us to drop the drm_driver.release callback from all
> drivers, and remove the mipi_dbi_release() function.
>
> This is made possible by a preceeding patch which added a drmm_
> cleanup action to drm_mode_config_init(), hence all we need to do to
> ensure that drm_mode_config_cleanup() is run on final drm_device
> cleanup is check the new error code for _init().
>
> v2: Explain why this cleanup is possible (Laurent).
>
> Cc: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Reviewed-by: Noralf Trønnes <noralf at tronnes.org>
> Tested-by: Noralf Trønnes <noralf at tronnes.org>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Maxime Ripard <mripard at kernel.org>
> Cc: Thomas Zimmermann <tzimmermann at suse.de>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: Eric Anholt <eric at anholt.net>
> Cc: David Lechner <david at lechnology.com>
> Cc: Kamlesh Gurudasani <kamlesh.gurudasani at gmail.com>
> Cc: "Noralf Trønnes" <noralf at tronnes.org>
> Cc: Sam Ravnborg <sam at ravnborg.org>
Acked-by: Sam Ravnborg <sam at ravnborg.org>
> ---
> drivers/gpu/drm/drm_mipi_dbi.c | 16 ----------------
> drivers/gpu/drm/tiny/hx8357d.c | 1 -
> drivers/gpu/drm/tiny/ili9225.c | 1 -
> drivers/gpu/drm/tiny/ili9341.c | 1 -
> drivers/gpu/drm/tiny/ili9486.c | 1 -
> drivers/gpu/drm/tiny/mi0283qt.c | 1 -
> drivers/gpu/drm/tiny/st7586.c | 1 -
> drivers/gpu/drm/tiny/st7735r.c | 1 -
> include/drm/drm_mipi_dbi.h | 1 -
> 9 files changed, 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
> index 9de1586659be..c0060a1c569f 100644
> --- a/drivers/gpu/drm/drm_mipi_dbi.c
> +++ b/drivers/gpu/drm/drm_mipi_dbi.c
> @@ -582,22 +582,6 @@ int mipi_dbi_dev_init(struct mipi_dbi_dev *dbidev,
> }
> EXPORT_SYMBOL(mipi_dbi_dev_init);
>
> -/**
> - * mipi_dbi_release - DRM driver release helper
> - * @drm: DRM device
> - *
> - * This function finalizes and frees &mipi_dbi.
> - *
> - * Drivers can use this as their &drm_driver->release callback.
> - */
> -void mipi_dbi_release(struct drm_device *drm)
> -{
> - DRM_DEBUG_DRIVER("\n");
> -
> - drm_mode_config_cleanup(drm);
> -}
> -EXPORT_SYMBOL(mipi_dbi_release);
> -
> /**
> * mipi_dbi_hw_reset - Hardware reset of controller
> * @dbi: MIPI DBI structure
> diff --git a/drivers/gpu/drm/tiny/hx8357d.c b/drivers/gpu/drm/tiny/hx8357d.c
> index c88b84366dc5..af7f3d10aac3 100644
> --- a/drivers/gpu/drm/tiny/hx8357d.c
> +++ b/drivers/gpu/drm/tiny/hx8357d.c
> @@ -196,7 +196,6 @@ DEFINE_DRM_GEM_CMA_FOPS(hx8357d_fops);
> static struct drm_driver hx8357d_driver = {
> .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
> .fops = &hx8357d_fops,
> - .release = mipi_dbi_release,
> DRM_GEM_CMA_VMAP_DRIVER_OPS,
> .debugfs_init = mipi_dbi_debugfs_init,
> .name = "hx8357d",
> diff --git a/drivers/gpu/drm/tiny/ili9225.c b/drivers/gpu/drm/tiny/ili9225.c
> index fa998a16026c..118477af4491 100644
> --- a/drivers/gpu/drm/tiny/ili9225.c
> +++ b/drivers/gpu/drm/tiny/ili9225.c
> @@ -346,7 +346,6 @@ DEFINE_DRM_GEM_CMA_FOPS(ili9225_fops);
> static struct drm_driver ili9225_driver = {
> .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
> .fops = &ili9225_fops,
> - .release = mipi_dbi_release,
> DRM_GEM_CMA_VMAP_DRIVER_OPS,
> .name = "ili9225",
> .desc = "Ilitek ILI9225",
> diff --git a/drivers/gpu/drm/tiny/ili9341.c b/drivers/gpu/drm/tiny/ili9341.c
> index 945e15169866..e152de369019 100644
> --- a/drivers/gpu/drm/tiny/ili9341.c
> +++ b/drivers/gpu/drm/tiny/ili9341.c
> @@ -152,7 +152,6 @@ DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops);
> static struct drm_driver ili9341_driver = {
> .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
> .fops = &ili9341_fops,
> - .release = mipi_dbi_release,
> DRM_GEM_CMA_VMAP_DRIVER_OPS,
> .debugfs_init = mipi_dbi_debugfs_init,
> .name = "ili9341",
> diff --git a/drivers/gpu/drm/tiny/ili9486.c b/drivers/gpu/drm/tiny/ili9486.c
> index 38d293cf5377..577aea662aa4 100644
> --- a/drivers/gpu/drm/tiny/ili9486.c
> +++ b/drivers/gpu/drm/tiny/ili9486.c
> @@ -165,7 +165,6 @@ DEFINE_DRM_GEM_CMA_FOPS(ili9486_fops);
> static struct drm_driver ili9486_driver = {
> .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
> .fops = &ili9486_fops,
> - .release = mipi_dbi_release,
> DRM_GEM_CMA_VMAP_DRIVER_OPS,
> .debugfs_init = mipi_dbi_debugfs_init,
> .name = "ili9486",
> diff --git a/drivers/gpu/drm/tiny/mi0283qt.c b/drivers/gpu/drm/tiny/mi0283qt.c
> index b8c973bc2347..decaf57053ff 100644
> --- a/drivers/gpu/drm/tiny/mi0283qt.c
> +++ b/drivers/gpu/drm/tiny/mi0283qt.c
> @@ -156,7 +156,6 @@ DEFINE_DRM_GEM_CMA_FOPS(mi0283qt_fops);
> static struct drm_driver mi0283qt_driver = {
> .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
> .fops = &mi0283qt_fops,
> - .release = mipi_dbi_release,
> DRM_GEM_CMA_VMAP_DRIVER_OPS,
> .debugfs_init = mipi_dbi_debugfs_init,
> .name = "mi0283qt",
> diff --git a/drivers/gpu/drm/tiny/st7586.c b/drivers/gpu/drm/tiny/st7586.c
> index 1f1a576be93c..c3295c717ba6 100644
> --- a/drivers/gpu/drm/tiny/st7586.c
> +++ b/drivers/gpu/drm/tiny/st7586.c
> @@ -285,7 +285,6 @@ DEFINE_DRM_GEM_CMA_FOPS(st7586_fops);
> static struct drm_driver st7586_driver = {
> .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
> .fops = &st7586_fops,
> - .release = mipi_dbi_release,
> DRM_GEM_CMA_VMAP_DRIVER_OPS,
> .debugfs_init = mipi_dbi_debugfs_init,
> .name = "st7586",
> diff --git a/drivers/gpu/drm/tiny/st7735r.c b/drivers/gpu/drm/tiny/st7735r.c
> index 0f48a5a2d3d7..631801c36f46 100644
> --- a/drivers/gpu/drm/tiny/st7735r.c
> +++ b/drivers/gpu/drm/tiny/st7735r.c
> @@ -157,7 +157,6 @@ DEFINE_DRM_GEM_CMA_FOPS(st7735r_fops);
> static struct drm_driver st7735r_driver = {
> .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
> .fops = &st7735r_fops,
> - .release = mipi_dbi_release,
> DRM_GEM_CMA_VMAP_DRIVER_OPS,
> .debugfs_init = mipi_dbi_debugfs_init,
> .name = "st7735r",
> diff --git a/include/drm/drm_mipi_dbi.h b/include/drm/drm_mipi_dbi.h
> index 33f325f5af2b..4129bba55873 100644
> --- a/include/drm/drm_mipi_dbi.h
> +++ b/include/drm/drm_mipi_dbi.h
> @@ -152,7 +152,6 @@ int mipi_dbi_dev_init_with_formats(struct mipi_dbi_dev *dbidev,
> int mipi_dbi_dev_init(struct mipi_dbi_dev *dbidev,
> const struct drm_simple_display_pipe_funcs *funcs,
> const struct drm_display_mode *mode, unsigned int rotation);
> -void mipi_dbi_release(struct drm_device *drm);
> void mipi_dbi_pipe_update(struct drm_simple_display_pipe *pipe,
> struct drm_plane_state *old_state);
> void mipi_dbi_enable_flush(struct mipi_dbi_dev *dbidev,
> --
> 2.24.1
More information about the dri-devel
mailing list