drm/fb-helper: Propagate errors from initial config failure

Make drm_fb_helper_initial_config() return an int rather than a bool so
that the error can be properly propagated. While at it, update drivers
to propagate errors further rather than just ignore them.

v2:
- cirrus: No cleanup is required, the top-level cirrus_driver_load()
  will do it as part of cirrus_driver_unload() in its cleanup path.
  Reported-by: Fengguang Wu <fengguang.wu@intel.com>

Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
[danvet: Squash in simplification patch from kbuild.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 18 insertions, 4 deletions

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index ddd90ddbc200..2d42ce6d3757 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -593,6 +593,7 @@ int psb_fbdev_init(struct drm_device *dev)
 {
         struct psb_fbdev *fbdev;
         struct drm_psb_private *dev_priv = dev->dev_private;
+        int ret;
 
         fbdev = kzalloc(sizeof(struct psb_fbdev), GFP_KERNEL);
         if (!fbdev) {
@@ -604,16 +605,29 @@ int psb_fbdev_init(struct drm_device *dev)
 
         drm_fb_helper_prepare(dev, &fbdev->psb_fb_helper, &psb_fb_helper_funcs);
 
-        drm_fb_helper_init(dev, &fbdev->psb_fb_helper, dev_priv->ops->crtcs,
-                                                        INTELFB_CONN_LIMIT);
+        ret = drm_fb_helper_init(dev, &fbdev->psb_fb_helper,
+                                 dev_priv->ops->crtcs, INTELFB_CONN_LIMIT);
+        if (ret)
+                goto free;
 
-        drm_fb_helper_single_add_all_connectors(&fbdev->psb_fb_helper);
+        ret = drm_fb_helper_single_add_all_connectors(&fbdev->psb_fb_helper);
+        if (ret)
+                goto fini;
 
         /* disable all the possible outputs/crtcs before entering KMS mode */
         drm_helper_disable_unused_functions(dev);
 
-        drm_fb_helper_initial_config(&fbdev->psb_fb_helper, 32);
+        ret = drm_fb_helper_initial_config(&fbdev->psb_fb_helper, 32);
+        if (ret)
+                goto fini;
+
         return 0;
+
+fini:
+        drm_fb_helper_fini(&fbdev->psb_fb_helper);
+free:
+        kfree(fbdev);
+        return ret;
 }
 
 static void psb_fbdev_fini(struct drm_device *dev)