drm/bridge: megachips: make connector creation optional (a8ef18d7) · Commits · 戴 / test

Make the connector creation optional to enable usage of the megachips-stdpxxxx-ge-b850v3-fw bridge with the DRM bridge connector helper. v2: - Set bridge.type to DRM_MODE_CONNECTOR_DisplayPort Signed-off-by:

Sam Ravnborg <sam@ravnborg.org> Reviewed-by:

Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Peter Senna Tschudin <peter.senna@gmail.com> Cc: Martin Donnelly <martin.donnelly@ge.com> Cc: Martyn Welch <martyn.welch@collabora.co.uk> Cc: Andrzej Hajda <a.hajda@samsung.com> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> Cc: Jonas Karlman <jonas@kwiboo.se> Cc: Jernej Skrabec <jernej.skrabec@siol.net> Link: https://patchwork.freedesktop.org/patch/msgid/20200726203324.3722593-14-sam@ravnborg.org

drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c

+5 −11

Original line number	Diff line number	Diff line
		@@ -245,16 +245,6 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge,
		{
		struct i2c_client *stdp4028_i2c
		= ge_b850v3_lvds_ptr->stdp4028_i2c;
		int ret;

		if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) {
		DRM_ERROR("Fix bridge driver to make connector optional!");
		return -EINVAL;
		}

		ret = ge_b850v3_lvds_create_connector(bridge);
		if (ret)
		return ret;

		/* Configures the bridge to re-enable interrupts after each ack. */
		i2c_smbus_write_word_data(stdp4028_i2c,
		@@ -266,7 +256,10 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge,
		STDP4028_DPTX_IRQ_EN_REG,
		STDP4028_DPTX_IRQ_CONFIG);

		if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)
		return 0;

		return ge_b850v3_lvds_create_connector(bridge);
		}

		static const struct drm_bridge_funcs ge_b850v3_lvds_funcs = {
		@@ -327,6 +320,7 @@ static int stdp4028_ge_b850v3_fw_probe(struct i2c_client *stdp4028_i2c,
		ge_b850v3_lvds_ptr->bridge.funcs = &ge_b850v3_lvds_funcs;
		ge_b850v3_lvds_ptr->bridge.ops = DRM_BRIDGE_OP_DETECT \|
		DRM_BRIDGE_OP_EDID;
		ge_b850v3_lvds_ptr->bridge.type = DRM_MODE_CONNECTOR_DisplayPort;
		ge_b850v3_lvds_ptr->bridge.of_node = dev->of_node;
		drm_bridge_add(&ge_b850v3_lvds_ptr->bridge);

Admin message