Commit 31cb3cd7 authored by Luca Ceresoli's avatar Luca Ceresoli
Browse files

drm/bridge: lt8912b: convert to of_drm_find_and_get_bridge() 



of_drm_find_bridge() is deprecated. Move to its replacement
of_drm_find_and_get_bridge() which gets a bridge reference, and ensure it
is put when done by using the drm_bridge::next_bridge pointer.

Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patch.msgid.link/20260109-drm-bridge-alloc-getput-drm_of_find_bridge-2-v2-7-8bad3ef90b9f@bootlin.com


Signed-off-by: default avatarLuca Ceresoli <luca.ceresoli@bootlin.com>
parent 0bbca46c

drivers/gpu/drm/bridge/lontium-lt8912b.c

+15 −16
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct lt8912 { 
	struct regmap *regmap[I2C_MAX_IDX];



	struct device_node *host_node;

	struct drm_bridge *hdmi_port;



	struct mipi_dsi_device *dsi;
@@ -407,8 +406,8 @@ lt8912_connector_detect(struct drm_connector *connector, bool force) 
{

	struct lt8912 *lt = connector_to_lt8912(connector);



	if (lt->hdmi_port->ops & DRM_BRIDGE_OP_DETECT)

		return drm_bridge_detect(lt->hdmi_port, connector);

	if (lt->bridge.next_bridge->ops & DRM_BRIDGE_OP_DETECT)

		return drm_bridge_detect(lt->bridge.next_bridge, connector);



	return lt8912_check_cable_status(lt);

}
@@ -429,7 +428,7 @@ static int lt8912_connector_get_modes(struct drm_connector *connector) 
	u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24;

	int ret, num;



	drm_edid = drm_bridge_edid_read(lt->hdmi_port, connector);

	drm_edid = drm_bridge_edid_read(lt->bridge.next_bridge, connector);

	drm_edid_connector_update(connector, drm_edid);

	if (!drm_edid)

		return 0;
@@ -519,8 +518,8 @@ static int lt8912_bridge_connector_init(struct drm_bridge *bridge) 
	struct lt8912 *lt = bridge_to_lt8912(bridge);

	struct drm_connector *connector = &lt->connector;



	if (lt->hdmi_port->ops & DRM_BRIDGE_OP_HPD) {

		drm_bridge_hpd_enable(lt->hdmi_port, lt8912_bridge_hpd_cb, lt);

	if (lt->bridge.next_bridge->ops & DRM_BRIDGE_OP_HPD) {

		drm_bridge_hpd_enable(lt->bridge.next_bridge, lt8912_bridge_hpd_cb, lt);

		connector->polled = DRM_CONNECTOR_POLL_HPD;

	} else {

		connector->polled = DRM_CONNECTOR_POLL_CONNECT |
@@ -529,7 +528,7 @@ static int lt8912_bridge_connector_init(struct drm_bridge *bridge) 


	ret = drm_connector_init(bridge->dev, connector,

				 &lt8912_connector_funcs,

				 lt->hdmi_port->type);

				 lt->bridge.next_bridge->type);

	if (ret)

		goto exit;
@@ -549,7 +548,7 @@ static int lt8912_bridge_attach(struct drm_bridge *bridge, 
	struct lt8912 *lt = bridge_to_lt8912(bridge);

	int ret;



	ret = drm_bridge_attach(encoder, lt->hdmi_port, bridge,

	ret = drm_bridge_attach(encoder, lt->bridge.next_bridge, bridge,

				DRM_BRIDGE_ATTACH_NO_CONNECTOR);

	if (ret < 0) {

		dev_err(lt->dev, "Failed to attach next bridge (%d)\n", ret);
@@ -585,8 +584,8 @@ static void lt8912_bridge_detach(struct drm_bridge *bridge) 


	lt8912_hard_power_off(lt);



	if (lt->connector.dev && lt->hdmi_port->ops & DRM_BRIDGE_OP_HPD)

		drm_bridge_hpd_disable(lt->hdmi_port);

	if (lt->connector.dev && lt->bridge.next_bridge->ops & DRM_BRIDGE_OP_HPD)

		drm_bridge_hpd_disable(lt->bridge.next_bridge);

}



static enum drm_mode_status
@@ -611,8 +610,8 @@ lt8912_bridge_detect(struct drm_bridge *bridge, struct drm_connector *connector) 
{

	struct lt8912 *lt = bridge_to_lt8912(bridge);



	if (lt->hdmi_port->ops & DRM_BRIDGE_OP_DETECT)

		return drm_bridge_detect(lt->hdmi_port, connector);

	if (lt->bridge.next_bridge->ops & DRM_BRIDGE_OP_DETECT)

		return drm_bridge_detect(lt->bridge.next_bridge, connector);



	return lt8912_check_cable_status(lt);

}
@@ -626,8 +625,8 @@ static const struct drm_edid *lt8912_bridge_edid_read(struct drm_bridge *bridge, 
	 * edid must be read through the ddc bus but it must be

	 * given to the hdmi connector node.

	 */

	if (lt->hdmi_port->ops & DRM_BRIDGE_OP_EDID)

		return drm_bridge_edid_read(lt->hdmi_port, connector);

	if (lt->bridge.next_bridge->ops & DRM_BRIDGE_OP_EDID)

		return drm_bridge_edid_read(lt->bridge.next_bridge, connector);



	dev_warn(lt->dev, "The connected bridge does not supports DRM_BRIDGE_OP_EDID\n");

	return NULL;
@@ -723,8 +722,8 @@ static int lt8912_parse_dt(struct lt8912 *lt) 
		goto err_free_host_node;

	}



	lt->hdmi_port = of_drm_find_bridge(port_node);

	if (!lt->hdmi_port) {

	lt->bridge.next_bridge = of_drm_find_and_get_bridge(port_node);

	if (!lt->bridge.next_bridge) {

		ret = -EPROBE_DEFER;

		dev_err_probe(lt->dev, ret, "%s: Failed to get hdmi port\n", __func__);

		goto err_free_host_node;