niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/fbdev-generic: Minimize hotplug error handling

Browse source 
Call drm_fb_helper_fini() in the generic-fbdev hotplug helper
to revert the effects of drm_fb_helper_init(). No full cleanup
is required.

v3:
	* fix error in commit message (Javier)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230125200415.14123-8-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2023-01-25 21:04:12 +01:00
parent 6c80a93be6
commit 643231b283
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/gpu/drm/drm_fbdev_generic.c
View file

@ -387,25 +387,21 @@ static int drm_fbdev_client_hotplug(struct drm_client_dev *client)
ret = drm_fb_helper_init(dev, fb_helper); ret = drm_fb_helper_init(dev, fb_helper);
if (ret) if (ret)
goto err; goto err_drm_err;
if (!drm_drv_uses_atomic_modeset(dev)) if (!drm_drv_uses_atomic_modeset(dev))
drm_helper_disable_unused_functions(dev); drm_helper_disable_unused_functions(dev);
ret = drm_fb_helper_initial_config(fb_helper); ret = drm_fb_helper_initial_config(fb_helper);
if (ret) if (ret)
goto err_cleanup; goto err_drm_fb_helper_fini;
return 0; return 0;
err_cleanup: err_drm_fb_helper_fini:
drm_fbdev_cleanup(fb_helper); drm_fb_helper_fini(fb_helper);
err: err_drm_err:
fb_helper->dev = NULL;
fb_helper->info = NULL;
drm_err(dev, "fbdev: Failed to setup generic emulation (ret=%d)\n", ret); drm_err(dev, "fbdev: Failed to setup generic emulation (ret=%d)\n", ret);
return ret; return ret;
} }