Commit c6533015 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Sam Ravnborg
Browse files

drm: bridge: adv7511: Split connector creation to a separate function 



To prepare for making the connector creation optional, move the related
code out of adv7511_bridge_attach() to a separate function.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200526011505.31884-3-laurent.pinchart+renesas@ideasonboard.com
parent fed9d35d

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+40 −22
Original line number Diff line number Diff line
@@ -783,7 +783,10 @@ static void adv7511_mode_set(struct adv7511 *adv7511, 
	adv7511->f_tmds = mode->clock;

}



/* Connector funcs */

/* -----------------------------------------------------------------------------

 * DRM Connector Operations

 */



static struct adv7511 *connector_to_adv7511(struct drm_connector *connector)

{

	return container_of(connector, struct adv7511, connector);
@@ -827,7 +830,40 @@ static const struct drm_connector_funcs adv7511_connector_funcs = { 
	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};



/* Bridge funcs */

static int adv7511_connector_init(struct adv7511 *adv)

{

	struct drm_bridge *bridge = &adv->bridge;

	int ret;



	if (!bridge->encoder) {

		DRM_ERROR("Parent encoder object not found");

		return -ENODEV;

	}



	if (adv->i2c_main->irq)

		adv->connector.polled = DRM_CONNECTOR_POLL_HPD;

	else

		adv->connector.polled = DRM_CONNECTOR_POLL_CONNECT |

				DRM_CONNECTOR_POLL_DISCONNECT;



	ret = drm_connector_init(bridge->dev, &adv->connector,

				 &adv7511_connector_funcs,

				 DRM_MODE_CONNECTOR_HDMIA);

	if (ret < 0) {

		DRM_ERROR("Failed to initialize connector with drm\n");

		return ret;

	}

	drm_connector_helper_add(&adv->connector,

				 &adv7511_connector_helper_funcs);

	drm_connector_attach_encoder(&adv->connector, bridge->encoder);



	return 0;

}



/* -----------------------------------------------------------------------------

 * DRM Bridge Operations

 */



static struct adv7511 *bridge_to_adv7511(struct drm_bridge *bridge)

{

	return container_of(bridge, struct adv7511, bridge);
@@ -867,27 +903,9 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge, 
		return -EINVAL;

	}



	if (!bridge->encoder) {

		DRM_ERROR("Parent encoder object not found");

		return -ENODEV;

	}



	if (adv->i2c_main->irq)

		adv->connector.polled = DRM_CONNECTOR_POLL_HPD;

	else

		adv->connector.polled = DRM_CONNECTOR_POLL_CONNECT |

				DRM_CONNECTOR_POLL_DISCONNECT;



	ret = drm_connector_init(bridge->dev, &adv->connector,

				 &adv7511_connector_funcs,

				 DRM_MODE_CONNECTOR_HDMIA);

	if (ret) {

		DRM_ERROR("Failed to initialize connector with drm\n");

	ret = adv7511_connector_init(adv);

	if (ret < 0)

		return ret;

	}

	drm_connector_helper_add(&adv->connector,

				 &adv7511_connector_helper_funcs);

	drm_connector_attach_encoder(&adv->connector, bridge->encoder);



	if (adv->type == ADV7533 || adv->type == ADV7535)

		ret = adv7533_attach_dsi(adv);