forked from Minki/linux
b7868c68a5
Commit 7566e24767 ("drm/fsl-dcu: handle initialization errors properly")
introduced error handling during initialization, but with a wrong cleanup
order.
Replace the error handling with the generic cleanup function
drm_mode_config_cleanup.
Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160619021543.23587-1-stefan@agner.ch
59 lines
1.4 KiB
C
59 lines
1.4 KiB
C
/*
|
|
* Copyright 2015 Freescale Semiconductor, Inc.
|
|
*
|
|
* Freescale DCU drm device driver
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
#include <drm/drm_fb_cma_helper.h>
|
|
|
|
#include "fsl_dcu_drm_crtc.h"
|
|
#include "fsl_dcu_drm_drv.h"
|
|
|
|
static const struct drm_mode_config_funcs fsl_dcu_drm_mode_config_funcs = {
|
|
.atomic_check = drm_atomic_helper_check,
|
|
.atomic_commit = drm_atomic_helper_commit,
|
|
.fb_create = drm_fb_cma_create,
|
|
};
|
|
|
|
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;
|
|
fsl_dev->drm->mode_config.min_height = 0;
|
|
fsl_dev->drm->mode_config.max_width = 2031;
|
|
fsl_dev->drm->mode_config.max_height = 2047;
|
|
fsl_dev->drm->mode_config.funcs = &fsl_dcu_drm_mode_config_funcs;
|
|
|
|
ret = fsl_dcu_drm_crtc_create(fsl_dev);
|
|
if (ret)
|
|
goto err;
|
|
|
|
ret = fsl_dcu_drm_encoder_create(fsl_dev, &fsl_dev->crtc);
|
|
if (ret)
|
|
goto err;
|
|
|
|
ret = fsl_dcu_drm_connector_create(fsl_dev, &fsl_dev->encoder);
|
|
if (ret)
|
|
goto err;
|
|
|
|
drm_mode_config_reset(fsl_dev->drm);
|
|
drm_kms_helper_poll_init(fsl_dev->drm);
|
|
|
|
return 0;
|
|
|
|
err:
|
|
drm_mode_config_cleanup(fsl_dev->drm);
|
|
return ret;
|
|
}
|