diff options
author | Thierry Reding <treding@nvidia.com> | 2014-12-19 05:21:32 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-21 08:57:03 -0500 |
commit | 01934c2a691882185b3021d437df13bcba07711d (patch) | |
tree | 6e891d192b0e4bd35b4f00ee013ea9763d5dc48d /drivers/gpu/drm/omapdrm/omap_fbdev.c | |
parent | 7119ad5f6b0ce222072b0c0b31c3b4ac87660afa (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_fbdev.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index 8436c6857cda..d292d24b3a6e 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c | |||
@@ -334,17 +334,23 @@ struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev) | |||
334 | goto fail; | 334 | goto fail; |
335 | } | 335 | } |
336 | 336 | ||
337 | drm_fb_helper_single_add_all_connectors(helper); | 337 | ret = drm_fb_helper_single_add_all_connectors(helper); |
338 | if (ret) | ||
339 | goto fini; | ||
338 | 340 | ||
339 | /* disable all the possible outputs/crtcs before entering KMS mode */ | 341 | /* disable all the possible outputs/crtcs before entering KMS mode */ |
340 | drm_helper_disable_unused_functions(dev); | 342 | drm_helper_disable_unused_functions(dev); |
341 | 343 | ||
342 | drm_fb_helper_initial_config(helper, 32); | 344 | ret = drm_fb_helper_initial_config(helper, 32); |
345 | if (ret) | ||
346 | goto fini; | ||
343 | 347 | ||
344 | priv->fbdev = helper; | 348 | priv->fbdev = helper; |
345 | 349 | ||
346 | return helper; | 350 | return helper; |
347 | 351 | ||
352 | fini: | ||
353 | drm_fb_helper_fini(helper); | ||
348 | fail: | 354 | fail: |
349 | kfree(fbdev); | 355 | kfree(fbdev); |
350 | return NULL; | 356 | return NULL; |