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/mgag200 | |
| 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/mgag200')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_fb.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 4415af3666ab..c36b8304042b 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c | |||
| @@ -303,14 +303,22 @@ int mgag200_fbdev_init(struct mga_device *mdev) | |||
| 303 | if (ret) | 303 | if (ret) |
| 304 | return ret; | 304 | return ret; |
| 305 | 305 | ||
| 306 | drm_fb_helper_single_add_all_connectors(&mfbdev->helper); | 306 | ret = drm_fb_helper_single_add_all_connectors(&mfbdev->helper); |
| 307 | if (ret) | ||
| 308 | goto fini; | ||
| 307 | 309 | ||
| 308 | /* disable all the possible outputs/crtcs before entering KMS mode */ | 310 | /* disable all the possible outputs/crtcs before entering KMS mode */ |
| 309 | drm_helper_disable_unused_functions(mdev->dev); | 311 | drm_helper_disable_unused_functions(mdev->dev); |
| 310 | 312 | ||
| 311 | drm_fb_helper_initial_config(&mfbdev->helper, bpp_sel); | 313 | ret = drm_fb_helper_initial_config(&mfbdev->helper, bpp_sel); |
| 314 | if (ret) | ||
| 315 | goto fini; | ||
| 312 | 316 | ||
| 313 | return 0; | 317 | return 0; |
| 318 | |||
| 319 | fini: | ||
| 320 | drm_fb_helper_fini(&mfbdev->helper); | ||
| 321 | return ret; | ||
| 314 | } | 322 | } |
| 315 | 323 | ||
| 316 | void mgag200_fbdev_fini(struct mga_device *mdev) | 324 | void mgag200_fbdev_fini(struct mga_device *mdev) |
