openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/udl: Drop explicit drm_mode_config_cleanup call 

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)

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
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>
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-50-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2020-03-23 15:49:48 +01:00
parent 3421a6c409
commit fe5b7c86d6
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/udl/udl_drv.c
View File

@ -37,7 +37,6 @@ DEFINE_DRM_GEM_FOPS(udl_driver_fops);
static void udl_driver_release(struct drm_device *dev) static void udl_driver_release(struct drm_device *dev)
{ {
udl_fini(dev); udl_fini(dev);
udl_modeset_cleanup(dev);
} }
static struct drm_driver driver = { static struct drm_driver driver = {

1
drivers/gpu/drm/udl/udl_drv.h
View File

@ -68,7 +68,6 @@ struct udl_device {
/* modeset */ /* modeset */
int udl_modeset_init(struct drm_device *dev); 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 drm_connector *udl_connector_init(struct drm_device *dev);
struct urb *udl_get_urb(struct drm_device *dev); struct urb *udl_get_urb(struct drm_device *dev);

21
drivers/gpu/drm/udl/udl_modeset.c
View File

@ -468,7 +468,9 @@ int udl_modeset_init(struct drm_device *dev)
struct drm_connector *connector; struct drm_connector *connector;
int ret; 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_width = 640;
dev->mode_config.min_height = 480; 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; dev->mode_config.funcs = &udl_mode_funcs;
connector = udl_connector_init(dev); connector = udl_connector_init(dev);
if (IS_ERR(connector)) { if (IS_ERR(connector))
ret = PTR_ERR(connector); return PTR_ERR(connector);
goto err_drm_mode_config_cleanup;
}
format_count = ARRAY_SIZE(udl_simple_display_pipe_formats); 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, udl_simple_display_pipe_formats,
format_count, NULL, connector); format_count, NULL, connector);
if (ret) if (ret)
goto err_drm_mode_config_cleanup; return ret;
drm_mode_config_reset(dev); drm_mode_config_reset(dev);
return 0; 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);
} }