Commit 4ace6fbc authored Jan 09, 2026 by Luca Ceresoli

drm/mediatek: mtk_hdmi*: 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: Maxime Ripard <mripard@kernel.org>
Link: https://patch.msgid.link/20260109-drm-bridge-alloc-getput-drm_of_find_bridge-3-v2-4-8d7a3dbacdf4@bootlin.com

Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

parent 6dfebeee

drivers/gpu/drm/mediatek/mtk_hdmi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -986,8 +986,8 @@ static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge,
		return -EINVAL;
		}

		if (hdmi->next_bridge) {
		ret = drm_bridge_attach(encoder, hdmi->next_bridge,
		if (hdmi->bridge.next_bridge) {
		ret = drm_bridge_attach(encoder, hdmi->bridge.next_bridge,
		bridge, flags);
		if (ret)
		return ret;

drivers/gpu/drm/mediatek/mtk_hdmi_common.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -315,8 +315,8 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, struct platform_device
		return -EINVAL;

		if (!of_device_is_compatible(remote, "hdmi-connector")) {
		hdmi->next_bridge = of_drm_find_bridge(remote);
		if (!hdmi->next_bridge) {
		hdmi->bridge.next_bridge = of_drm_find_and_get_bridge(remote);
		if (!hdmi->bridge.next_bridge) {
		dev_err(dev, "Waiting for external bridge\n");
		of_node_put(remote);
		return -EPROBE_DEFER;

drivers/gpu/drm/mediatek/mtk_hdmi_common.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,6 @@ struct mtk_hdmi_conf {

		struct mtk_hdmi {
		struct drm_bridge bridge;
		struct drm_bridge *next_bridge;
		struct drm_connector curr_conn;/ current connector (only valid when 'enabled') */
		struct device *dev;
		const struct mtk_hdmi_conf *conf;

drivers/gpu/drm/mediatek/mtk_hdmi_v2.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -960,8 +960,8 @@ static int mtk_hdmi_v2_bridge_attach(struct drm_bridge *bridge,
		DRM_ERROR("The flag DRM_BRIDGE_ATTACH_NO_CONNECTOR must be supplied\n");
		return -EINVAL;
		}
		if (hdmi->next_bridge) {
		ret = drm_bridge_attach(encoder, hdmi->next_bridge, bridge, flags);
		if (hdmi->bridge.next_bridge) {
		ret = drm_bridge_attach(encoder, hdmi->bridge.next_bridge, bridge, flags);
		if (ret)
		return ret;
		}