iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/mcde: Drop explicit drm_mode_config_cleanup call

Browse Source 
Allows us to drop the drm_driver.release callback.

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: Sam Ravnborg <sam@ravnborg.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org> (v2)
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-33-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2020-03-23 15:49:31 +01:00
parent fe1cc102a3
commit 4b055ab137
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/mcde/mcde_drv.c
View File

@ -184,13 +184,13 @@ static int mcde_modeset_init(struct drm_device *drm)
ret = drm_vblank_init(drm, 1); ret = drm_vblank_init(drm, 1);
if (ret) { if (ret) {
dev_err(drm->dev, "failed to init vblank\n"); dev_err(drm->dev, "failed to init vblank\n");
goto out_config; return ret;
} }
ret = mcde_display_init(drm); ret = mcde_display_init(drm);
if (ret) { if (ret) {
dev_err(drm->dev, "failed to init display\n"); dev_err(drm->dev, "failed to init display\n");
goto out_config; return ret;
} }
/* /*
@ -204,7 +204,7 @@ static int mcde_modeset_init(struct drm_device *drm)
mcde->bridge); mcde->bridge);
if (ret) { if (ret) {
dev_err(drm->dev, "failed to attach display output bridge\n"); dev_err(drm->dev, "failed to attach display output bridge\n");
goto out_config; return ret;
} }
drm_mode_config_reset(drm); drm_mode_config_reset(drm);
@ -212,15 +212,6 @@ static int mcde_modeset_init(struct drm_device *drm)
drm_fbdev_generic_setup(drm, 32); drm_fbdev_generic_setup(drm, 32);
return 0; return 0;
out_config:
drm_mode_config_cleanup(drm);
return ret;
}
static void mcde_release(struct drm_device *drm)
{
drm_mode_config_cleanup(drm);
} }
DEFINE_DRM_GEM_CMA_FOPS(drm_fops); DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
@ -228,7 +219,6 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
static struct drm_driver mcde_drm_driver = { static struct drm_driver mcde_drm_driver = {
.driver_features = .driver_features =
DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
.release = mcde_release,
.lastclose = drm_fb_helper_lastclose, .lastclose = drm_fb_helper_lastclose,
.ioctls = NULL, .ioctls = NULL,
.fops = &drm_fops, .fops = &drm_fops,
@ -256,7 +246,9 @@ static int mcde_drm_bind(struct device *dev)
struct drm_device *drm = dev_get_drvdata(dev); struct drm_device *drm = dev_get_drvdata(dev);
int ret; int ret;
drm_mode_config_init(drm); ret = drmm_mode_config_init(drm);
if (ret)
return ret;
ret = component_bind_all(drm->dev, drm); ret = component_bind_all(drm->dev, drm);
if (ret) { if (ret) {