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

Commit 3e68439b authored by Russell King's avatar Russell King
Browse files

imx-drm: imx-drm-core: add core hotplug connector support 



Add core imx-drm support for hotplug connector support.  We need to
setup the poll helper after we've setup the connectors; the helper
scans the connectors to determine their capabilities.

Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e7d6231e

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

+17 −4
Original line number Diff line number Diff line
@@ -69,7 +69,11 @@ static int imx_drm_driver_unload(struct drm_device *drm) 
{

#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)

	struct imx_drm_device *imxdrm = drm->dev_private;

#endif



	drm_kms_helper_poll_fini(drm);



#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)

	if (imxdrm->fbhelper)

		drm_fbdev_cma_fini(imxdrm->fbhelper);

#endif
@@ -77,7 +81,6 @@ static int imx_drm_driver_unload(struct drm_device *drm) 
	component_unbind_all(drm->dev, drm);



	drm_vblank_cleanup(drm);

	drm_kms_helper_poll_fini(drm);

	drm_mode_config_cleanup(drm);



	return 0;
@@ -213,8 +216,18 @@ void imx_drm_encoder_destroy(struct drm_encoder *encoder) 
}

EXPORT_SYMBOL_GPL(imx_drm_encoder_destroy);



static void imx_drm_output_poll_changed(struct drm_device *drm)

{

#if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER)

	struct imx_drm_device *imxdrm = drm->dev_private;



	drm_fbdev_cma_hotplug_event(imxdrm->fbhelper);

#endif

}



static struct drm_mode_config_funcs imx_drm_mode_config_funcs = {

	.fb_create = drm_fb_cma_create,

	.output_poll_changed = imx_drm_output_poll_changed,

};



/*
@@ -259,8 +272,6 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags) 


	drm_mode_config_init(drm);



	drm_kms_helper_poll_init(drm);



	ret = drm_vblank_init(drm, MAX_CRTC);

	if (ret)

		goto err_kms;
@@ -313,6 +324,9 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags) 
		goto err_unbind;

	}

#endif



	drm_kms_helper_poll_init(drm);



	return 0;



err_unbind:
@@ -320,7 +334,6 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags) 
err_vblank:

	drm_vblank_cleanup(drm);

err_kms:

	drm_kms_helper_poll_fini(drm);

	drm_mode_config_cleanup(drm);



	return ret;