mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
drm/fsl-dcu: handle initialization errors properly
If initialization fails (e.g. due to missing panel node or deferred probe) make sure to roll-back all operations and return the error code. Signed-off-by: Stefan Agner <stefan@agner.ch>
This commit is contained in:
parent
72cc05a518
commit
7566e24767
1 changed files with 20 additions and 4 deletions
|
@ -25,6 +25,8 @@ static const struct drm_mode_config_funcs fsl_dcu_drm_mode_config_funcs = {
|
|||
|
||||
int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
drm_mode_config_init(fsl_dev->drm);
|
||||
|
||||
fsl_dev->drm->mode_config.min_width = 0;
|
||||
|
@ -33,11 +35,25 @@ int fsl_dcu_drm_modeset_init(struct fsl_dcu_drm_device *fsl_dev)
|
|||
fsl_dev->drm->mode_config.max_height = 2047;
|
||||
fsl_dev->drm->mode_config.funcs = &fsl_dcu_drm_mode_config_funcs;
|
||||
|
||||
drm_kms_helper_poll_init(fsl_dev->drm);
|
||||
fsl_dcu_drm_crtc_create(fsl_dev);
|
||||
fsl_dcu_drm_encoder_create(fsl_dev, &fsl_dev->crtc);
|
||||
fsl_dcu_drm_connector_create(fsl_dev, &fsl_dev->encoder);
|
||||
ret = fsl_dcu_drm_crtc_create(fsl_dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = fsl_dcu_drm_encoder_create(fsl_dev, &fsl_dev->crtc);
|
||||
if (ret)
|
||||
goto fail_encoder;
|
||||
|
||||
ret = fsl_dcu_drm_connector_create(fsl_dev, &fsl_dev->encoder);
|
||||
if (ret)
|
||||
goto fail_connector;
|
||||
|
||||
drm_mode_config_reset(fsl_dev->drm);
|
||||
drm_kms_helper_poll_init(fsl_dev->drm);
|
||||
|
||||
return 0;
|
||||
fail_encoder:
|
||||
fsl_dev->crtc.funcs->destroy(&fsl_dev->crtc);
|
||||
fail_connector:
|
||||
fsl_dev->encoder.funcs->destroy(&fsl_dev->encoder);
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue