On Thu, Feb 27, 2020 at 07:15:20PM +0100, Daniel Vetter wrote:
> It's right above the drm_dev_put().
>
> This allows us to delete a bit of onion unwinding in
> udl_modeset_init().
>
> 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@xxxxxxxxxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> Cc: Dave Airlie <airlied@xxxxxxxxxx>
> Cc: Sean Paul <sean@xxxxxxxxxx>
> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Cc: Emil Velikov <emil.l.velikov@xxxxxxxxx>
> Cc: Gerd Hoffmann <kraxel@xxxxxxxxxx>
> Cc: "Noralf Trønnes" <noralf@xxxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> ---
> drivers/gpu/drm/udl/udl_drv.c | 1 -
> drivers/gpu/drm/udl/udl_drv.h | 1 -
> drivers/gpu/drm/udl/udl_modeset.c | 21 ++++++---------------
> 3 files changed, 6 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
> index 8b78c356beb5..b447fb053e78 100644
> --- a/drivers/gpu/drm/udl/udl_drv.c
> +++ b/drivers/gpu/drm/udl/udl_drv.c
> @@ -37,7 +37,6 @@ DEFINE_DRM_GEM_FOPS(udl_driver_fops);
> static void udl_driver_release(struct drm_device *dev)
> {
> udl_fini(dev);
> - udl_modeset_cleanup(dev);
> }
>
> static struct drm_driver driver = {
> diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
> index e67227c44cc4..1de7eb1b6aac 100644
> --- a/drivers/gpu/drm/udl/udl_drv.h
> +++ b/drivers/gpu/drm/udl/udl_drv.h
> @@ -68,7 +68,6 @@ struct udl_device {
>
> /* modeset */
> int udl_modeset_init(struct drm_device *dev);
> -void udl_modeset_cleanup(struct drm_device *dev);
> struct drm_connector *udl_connector_init(struct drm_device *dev);
>
> struct urb *udl_get_urb(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
> index d59ebac70b15..cad0c87f8de6 100644
> --- a/drivers/gpu/drm/udl/udl_modeset.c
> +++ b/drivers/gpu/drm/udl/udl_modeset.c
> @@ -468,7 +468,9 @@ int udl_modeset_init(struct drm_device *dev)
> struct drm_connector *connector;
> int ret;
>
> - drm_mode_config_init(dev);
> + ret = drm_mode_config_init(dev);
> + if (ret)
> + return ret;
>
> dev->mode_config.min_width = 640;
> dev->mode_config.min_height = 480;
> @@ -482,10 +484,8 @@ int udl_modeset_init(struct drm_device *dev)
> dev->mode_config.funcs = &udl_mode_funcs;
>
> connector = udl_connector_init(dev);
> - if (IS_ERR(connector)) {
> - ret = PTR_ERR(connector);
> - goto err_drm_mode_config_cleanup;
> - }
> + if (IS_ERR(connector))
> + return PTR_ERR(connector);
>
> format_count = ARRAY_SIZE(udl_simple_display_pipe_formats);
>
> @@ -494,18 +494,9 @@ int udl_modeset_init(struct drm_device *dev)
> udl_simple_display_pipe_formats,
> format_count, NULL, connector);
> if (ret)
> - goto err_drm_mode_config_cleanup;
> + return ret;
>
> drm_mode_config_reset(dev);
>
> return 0;
> -
> -err_drm_mode_config_cleanup:
> - drm_mode_config_cleanup(dev);
> - return ret;
> -}
> -
> -void udl_modeset_cleanup(struct drm_device *dev)
> -{
> - drm_mode_config_cleanup(dev);
> }
> --
> 2.24.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
