Commit c4f5538f authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Neil Armstrong
Browse files

drm/omap: stop using drm_bridge_connector_en/disable_hpd() 



The functionality of drm_bridge_connector_enable_hpd() and
drm_bridge_connector_disable_hpd() is provided automatically by the
drm_kms_poll helpers. Stop calling these functions manually.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20221102180705.459294-7-dmitry.baryshkov@linaro.org
parent 9e954403

drivers/gpu/drm/omapdrm/omap_drv.c

+0 −41
Original line number Diff line number Diff line
@@ -545,44 +545,6 @@ static void omap_modeset_fini(struct drm_device *ddev) 
	drm_mode_config_cleanup(ddev);

}



/*

 * Enable the HPD in external components if supported

 */

static void omap_modeset_enable_external_hpd(struct drm_device *ddev)

{

	struct omap_drm_private *priv = ddev->dev_private;

	unsigned int i;



	for (i = 0; i < priv->num_pipes; i++) {

		struct drm_connector *connector = priv->pipes[i].connector;



		if (!connector)

			continue;



		if (priv->pipes[i].output->bridge)

			drm_bridge_connector_enable_hpd(connector);

	}

}



/*

 * Disable the HPD in external components if supported

 */

static void omap_modeset_disable_external_hpd(struct drm_device *ddev)

{

	struct omap_drm_private *priv = ddev->dev_private;

	unsigned int i;



	for (i = 0; i < priv->num_pipes; i++) {

		struct drm_connector *connector = priv->pipes[i].connector;



		if (!connector)

			continue;



		if (priv->pipes[i].output->bridge)

			drm_bridge_connector_disable_hpd(connector);

	}

}



/*

 * drm ioctl funcs

 */
@@ -782,7 +744,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) 
	omap_fbdev_init(ddev);



	drm_kms_helper_poll_init(ddev);

	omap_modeset_enable_external_hpd(ddev);



	/*

	 * Register the DRM device with the core and the connectors with
@@ -795,7 +756,6 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev) 
	return 0;



err_cleanup_helpers:

	omap_modeset_disable_external_hpd(ddev);

	drm_kms_helper_poll_fini(ddev);



	omap_fbdev_fini(ddev);
@@ -822,7 +782,6 @@ static void omapdrm_cleanup(struct omap_drm_private *priv) 


	drm_dev_unregister(ddev);



	omap_modeset_disable_external_hpd(ddev);

	drm_kms_helper_poll_fini(ddev);



	omap_fbdev_fini(ddev);