drm/fbdev-generic: Initialize fb-helper structure in generic setup

Initialize the fb-helper structure immediately after its allocation
in drm_fbdev_generic_setup(). That will make it easier to fill it with
driver-specific values, such as the preferred BPP.

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-5-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/drm_fbdev_generic.c b/drivers/gpu/drm/drm_fbdev_generic.c
index 135d58b..63f6632 100644 (file)
--- a/drivers/gpu/drm/drm_fbdev_generic.c
+++ b/drivers/gpu/drm/drm_fbdev_generic.c
@@ -385,8 +385,6 @@ static int drm_fbdev_client_hotplug(struct drm_client_dev *client)
        if (dev->fb_helper)
                return drm_fb_helper_hotplug_event(dev->fb_helper);
 
-       drm_fb_helper_prepare(dev, fb_helper, &drm_fb_helper_generic_funcs);
-
        ret = drm_fb_helper_init(dev, fb_helper);
        if (ret)
                goto err;
@@ -456,12 +454,12 @@ void drm_fbdev_generic_setup(struct drm_device *dev,
        fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);
        if (!fb_helper)
                return;
+       drm_fb_helper_prepare(dev, fb_helper, &drm_fb_helper_generic_funcs);
 
        ret = drm_client_init(dev, &fb_helper->client, "fbdev", &drm_fbdev_client_funcs);
        if (ret) {
-               kfree(fb_helper);
                drm_err(dev, "Failed to register client: %d\n", ret);
-               return;
+               goto err_drm_client_init;
        }
 
        /*
@@ -484,5 +482,12 @@ void drm_fbdev_generic_setup(struct drm_device *dev,
                drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);
 
        drm_client_register(&fb_helper->client);
+
+       return;
+
+err_drm_client_init:
+       drm_fb_helper_unprepare(fb_helper);
+       kfree(fb_helper);
+       return;
 }
 EXPORT_SYMBOL(drm_fbdev_generic_setup);