| Message ID | 20200323144950.3018436-50-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm_device managed resources, v5 | expand |
Am 23.03.20 um 15:49 schrieb Daniel Vetter: > 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). > > v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas) > > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Acked-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Sean Paul <sean@poorly.run> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Emil Velikov <emil.l.velikov@gmail.com> > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: "Noralf Trønnes" <noralf@tronnes.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Sam Ravnborg <sam@ravnborg.org> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > 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..8cad01f3d163 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 = drmm_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); > } >
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..8cad01f3d163 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 = drmm_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); }