Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec9557d7 authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

imx-drm: imx-drm-core: merge imx_drm_crtc_register() into imx_drm_add_crtc() 



There's no reason for this to be a separate function; merge the
two together.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 020a9ea7

drivers/staging/imx-drm/imx-drm-core.c

+9 −24
Original line number Diff line number Diff line
@@ -369,29 +369,6 @@ static void imx_drm_connector_unregister( 
	drm_mode_group_reinit(imxdrm->drm);

}



/*

 * register a crtc to the drm core

 */

static int imx_drm_crtc_register(struct imx_drm_crtc *imx_drm_crtc)

{

	struct imx_drm_device *imxdrm = __imx_drm_device();

	int ret;



	ret = drm_mode_crtc_set_gamma_size(imx_drm_crtc->crtc, 256);

	if (ret)

		return ret;



	drm_crtc_helper_add(imx_drm_crtc->crtc,

			imx_drm_crtc->imx_drm_helper_funcs.crtc_helper_funcs);



	drm_crtc_init(imxdrm->drm, imx_drm_crtc->crtc,

			imx_drm_crtc->imx_drm_helper_funcs.crtc_funcs);



	drm_mode_group_reinit(imxdrm->drm);



	return 0;

}



/*

 * Called by the CRTC driver when all CRTCs are registered. This

 * puts all the pieces together and initializes the driver.
@@ -536,10 +513,18 @@ int imx_drm_add_crtc(struct drm_crtc *crtc, 


	*new_crtc = imx_drm_crtc;



	ret = imx_drm_crtc_register(imx_drm_crtc);

	ret = drm_mode_crtc_set_gamma_size(imx_drm_crtc->crtc, 256);

	if (ret)

		goto err_register;



	drm_crtc_helper_add(crtc,

			imx_drm_crtc->imx_drm_helper_funcs.crtc_helper_funcs);



	drm_crtc_init(imxdrm->drm, crtc,

			imx_drm_crtc->imx_drm_helper_funcs.crtc_funcs);



	drm_mode_group_reinit(imxdrm->drm);



	imx_drm_update_possible_crtcs();



	mutex_unlock(&imxdrm->mutex);