From: Luca Ceresoli <luca.ceresoli@bootlin•com>
To: Maarten Lankhorst <maarten.lankhorst@linux•intel.com>,
Maxime Ripard <mripard@kernel•org>,
Thomas Zimmermann <tzimmermann@suse•de>,
David Airlie <airlied@gmail•com>,
Simona Vetter <simona@ffwll•ch>,
Andrzej Hajda <andrzej.hajda@intel•com>,
Neil Armstrong <neil.armstrong@linaro•org>,
Robert Foss <rfoss@kernel•org>,
Laurent Pinchart <Laurent.pinchart@ideasonboard•com>,
Jonas Karlman <jonas@kwiboo•se>,
Jernej Skrabec <jernej.skrabec@gmail•com>,
Inki Dae <inki.dae@samsung•com>,
Jagan Teki <jagan@amarulasolutions•com>,
Marek Szyprowski <m.szyprowski@samsung•com>,
Marek Vasut <marex@denx•de>, Stefan Agner <stefan@agner•ch>,
Frank Li <Frank.Li@nxp•com>,
Sascha Hauer <s.hauer@pengutronix•de>,
Pengutronix Kernel Team <kernel@pengutronix•de>,
Fabio Estevam <festevam@gmail•com>
Cc: Hui Pu <Hui.Pu@gehealthcare•com>,
Ian Ray <ian.ray@gehealthcare•com>,
Thomas Petazzoni <thomas.petazzoni@bootlin•com>,
dri-devel@lists•freedesktop.org, linux-kernel@vger•kernel.org,
imx@lists•linux.dev, linux-arm-kernel@lists•infradead.org,
Luca Ceresoli <luca.ceresoli@bootlin•com>
Subject: [PATCH 16/37] drm/display: bridge-connector: move per-connector fields to the dynamic connector
Date: Tue, 19 May 2026 12:37:33 +0200 [thread overview]
Message-ID: <20260519-drm-bridge-hotplug-v1-16-45e2bdb3dfb4@bootlin.com> (raw)
In-Reply-To: <20260519-drm-bridge-hotplug-v1-0-45e2bdb3dfb4@bootlin.com>
The various bridge pointers and the hdmi_funcs pointer are per-connector
specific. In other words, when introducing bridge hotplug and the
dynamically-created connector, they will have to be set per each created
connector, possibly with different values from any previously created
connector.
Those pointers are currently in struct drm_bridge_connector, which will
persist across multiple connector creations and destructions. This means
when a dynamic connector is created before the previous one is destroyed,
these fields would be overwritten by the new connector but the old one will
still reference them. This would lead to possible put of incorrect briges,
resulting in use-after-free and leaks.
In preparation for bridge hotplug, move all those fields from struct
drm_bridge_connector to struct drm_bridge_connector_dynconn, so they have
the same allocation and lifetime of the connector they refer to.
Update the many locations where these fields are used.
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin•com>
---
drivers/gpu/drm/display/drm_bridge_connector.c | 370 +++++++++++++------------
1 file changed, 187 insertions(+), 183 deletions(-)
diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c
index b4e2c8f1d32d..bd421b6beb7c 100644
--- a/drivers/gpu/drm/display/drm_bridge_connector.c
+++ b/drivers/gpu/drm/display/drm_bridge_connector.c
@@ -67,26 +67,6 @@ struct drm_bridge_connector_dynconn {
* @connector: the drm_connector exposed to user space
*/
struct drm_connector connector;
-};
-
-/**
- * struct drm_bridge_connector - A connector backed by a chain of bridges
- */
-struct drm_bridge_connector {
- /**
- * @drm: The DRM device we belong to
- */
- struct drm_device *drm;
- /**
- * @encoder:
- *
- * The encoder at the start of the bridges chain.
- */
- struct drm_encoder *encoder;
- /**
- * @dynconn: The DRM connector added by the drm_bridge_connector
- */
- struct drm_bridge_connector_dynconn *dynconn;
/**
* @bridge_edid:
*
@@ -154,24 +134,47 @@ struct drm_bridge_connector {
struct drm_connector_hdmi_funcs hdmi_funcs;
};
-static struct drm_bridge_connector *to_drm_bridge_connector(const struct drm_connector *connector)
+/**
+ * struct drm_bridge_connector - A connector backed by a chain of bridges
+ */
+struct drm_bridge_connector {
+ /**
+ * @drm: The DRM device we belong to
+ */
+ struct drm_device *drm;
+ /**
+ * @encoder:
+ *
+ * The encoder at the start of the bridges chain.
+ */
+ struct drm_encoder *encoder;
+ /**
+ * @dynconn: The DRM connector added by the drm_bridge_connector
+ */
+ struct drm_bridge_connector_dynconn *dynconn;
+};
+
+static struct drm_bridge_connector_dynconn *
+to_drm_bridge_connector_dynconn(const struct drm_connector *connector)
{
- const struct drm_bridge_connector_dynconn *dynconn =
- container_of(connector, struct drm_bridge_connector_dynconn, connector);
+ return container_of(connector, struct drm_bridge_connector_dynconn, connector);
+}
- return dynconn->bridge_connector;
+static struct drm_bridge_connector *to_drm_bridge_connector(const struct drm_connector *connector)
+{
+ return to_drm_bridge_connector_dynconn(connector)->bridge_connector;
}
-static void drm_bridge_connector_put_bridges(struct drm_bridge_connector *bridge_connector)
+static void drm_bridge_connector_put_bridges(struct drm_bridge_connector_dynconn *dynconn)
{
- drm_bridge_put(bridge_connector->bridge_edid);
- drm_bridge_put(bridge_connector->bridge_hpd);
- drm_bridge_put(bridge_connector->bridge_detect);
- drm_bridge_put(bridge_connector->bridge_modes);
- drm_bridge_put(bridge_connector->bridge_hdmi);
- drm_bridge_put(bridge_connector->bridge_hdmi_audio);
- drm_bridge_put(bridge_connector->bridge_dp_audio);
- drm_bridge_put(bridge_connector->bridge_hdmi_cec);
+ drm_bridge_put(dynconn->bridge_edid);
+ drm_bridge_put(dynconn->bridge_hpd);
+ drm_bridge_put(dynconn->bridge_detect);
+ drm_bridge_put(dynconn->bridge_modes);
+ drm_bridge_put(dynconn->bridge_hdmi);
+ drm_bridge_put(dynconn->bridge_hdmi_audio);
+ drm_bridge_put(dynconn->bridge_dp_audio);
+ drm_bridge_put(dynconn->bridge_hdmi_cec);
}
/* -----------------------------------------------------------------------------
@@ -225,7 +228,9 @@ static void drm_bridge_connector_enable_hpd(struct drm_connector *connector)
{
struct drm_bridge_connector *bridge_connector =
to_drm_bridge_connector(connector);
- struct drm_bridge *hpd = bridge_connector->bridge_hpd;
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
+ struct drm_bridge *hpd = dynconn->bridge_hpd;
if (hpd)
drm_bridge_hpd_enable(hpd, drm_bridge_connector_hpd_cb,
@@ -234,9 +239,9 @@ static void drm_bridge_connector_enable_hpd(struct drm_connector *connector)
static void drm_bridge_connector_disable_hpd(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
- struct drm_bridge *hpd = bridge_connector->bridge_hpd;
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
+ struct drm_bridge *hpd = dynconn->bridge_hpd;
if (hpd)
drm_bridge_hpd_disable(hpd);
@@ -249,10 +254,10 @@ static void drm_bridge_connector_disable_hpd(struct drm_connector *connector)
static enum drm_connector_status
drm_bridge_connector_detect(struct drm_connector *connector, bool force)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
- struct drm_bridge *detect = bridge_connector->bridge_detect;
- struct drm_bridge *hdmi = bridge_connector->bridge_hdmi;
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
+ struct drm_bridge *detect = dynconn->bridge_detect;
+ struct drm_bridge *hdmi = dynconn->bridge_hdmi;
enum drm_connector_status status;
if (detect) {
@@ -281,9 +286,9 @@ drm_bridge_connector_detect(struct drm_connector *connector, bool force)
static void drm_bridge_connector_force(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
- struct drm_bridge *hdmi = bridge_connector->bridge_hdmi;
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
+ struct drm_bridge *hdmi = dynconn->bridge_hdmi;
if (hdmi)
drm_atomic_helper_connector_hdmi_force(connector);
@@ -305,11 +310,11 @@ static void drm_bridge_connector_debugfs_init(struct drm_connector *connector,
static void drm_bridge_connector_reset(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
drm_atomic_helper_connector_reset(connector);
- if (bridge_connector->bridge_hdmi)
+ if (dynconn->bridge_hdmi)
__drm_atomic_helper_connector_hdmi_reset(connector,
connector->state);
}
@@ -320,7 +325,7 @@ static void drm_bridge_connector_dynconn_destroy(struct drm_connector *connector
container_of(connector, struct drm_bridge_connector_dynconn, connector);
drm_connector_cleanup(connector);
- drm_bridge_connector_put_bridges(dynconn->bridge_connector);
+ drm_bridge_connector_put_bridges(dynconn);
kfree(dynconn);
}
@@ -370,15 +375,15 @@ static int drm_bridge_connector_get_modes_edid(struct drm_connector *connector,
static int drm_bridge_connector_get_modes(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
/*
* If there is a HDMI bridge, EDID has been updated as a part of
* the .detect(). Just update the modes here.
*/
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (bridge)
return drm_edid_connector_add_modes(connector);
@@ -386,7 +391,7 @@ static int drm_bridge_connector_get_modes(struct drm_connector *connector)
* If display exposes EDID, then we parse that in the normal way to
* build table of supported modes.
*/
- bridge = bridge_connector->bridge_edid;
+ bridge = dynconn->bridge_edid;
if (bridge)
return drm_bridge_connector_get_modes_edid(connector, bridge);
@@ -394,7 +399,7 @@ static int drm_bridge_connector_get_modes(struct drm_connector *connector)
* Otherwise if the display pipeline reports modes (e.g. with a fixed
* resolution panel or an analog TV output), query it.
*/
- bridge = bridge_connector->bridge_modes;
+ bridge = dynconn->bridge_modes;
if (bridge)
return bridge->funcs->get_modes(bridge, connector);
@@ -410,10 +415,10 @@ static enum drm_mode_status
drm_bridge_connector_mode_valid(struct drm_connector *connector,
const struct drm_display_mode *mode)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
- if (bridge_connector->bridge_hdmi)
+ if (dynconn->bridge_hdmi)
return drm_hdmi_connector_mode_valid(connector, mode);
return MODE_OK;
@@ -422,10 +427,10 @@ drm_bridge_connector_mode_valid(struct drm_connector *connector,
static int drm_bridge_connector_atomic_check(struct drm_connector *connector,
struct drm_atomic_commit *state)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
- if (bridge_connector->bridge_hdmi)
+ if (dynconn->bridge_hdmi)
return drm_atomic_helper_connector_hdmi_check(connector, state);
return 0;
@@ -444,11 +449,11 @@ drm_bridge_connector_tmds_char_rate_valid(const struct drm_connector *connector,
const struct drm_display_mode *mode,
unsigned long long tmds_rate)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return MODE_ERROR;
@@ -460,11 +465,11 @@ drm_bridge_connector_tmds_char_rate_valid(const struct drm_connector *connector,
static int drm_bridge_connector_clear_avi_infoframe(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -474,11 +479,11 @@ static int drm_bridge_connector_clear_avi_infoframe(struct drm_connector *connec
static int drm_bridge_connector_write_avi_infoframe(struct drm_connector *connector,
const u8 *buffer, size_t len)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -487,11 +492,11 @@ static int drm_bridge_connector_write_avi_infoframe(struct drm_connector *connec
static int drm_bridge_connector_clear_hdmi_infoframe(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -501,11 +506,11 @@ static int drm_bridge_connector_clear_hdmi_infoframe(struct drm_connector *conne
static int drm_bridge_connector_write_hdmi_infoframe(struct drm_connector *connector,
const u8 *buffer, size_t len)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -514,11 +519,11 @@ static int drm_bridge_connector_write_hdmi_infoframe(struct drm_connector *conne
static int drm_bridge_connector_clear_audio_infoframe(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -528,11 +533,11 @@ static int drm_bridge_connector_clear_audio_infoframe(struct drm_connector *conn
static int drm_bridge_connector_write_audio_infoframe(struct drm_connector *connector,
const u8 *buffer, size_t len)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -541,11 +546,11 @@ static int drm_bridge_connector_write_audio_infoframe(struct drm_connector *conn
static int drm_bridge_connector_clear_hdr_drm_infoframe(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -555,11 +560,11 @@ static int drm_bridge_connector_clear_hdr_drm_infoframe(struct drm_connector *co
static int drm_bridge_connector_write_hdr_drm_infoframe(struct drm_connector *connector,
const u8 *buffer, size_t len)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -568,11 +573,11 @@ static int drm_bridge_connector_write_hdr_drm_infoframe(struct drm_connector *co
static int drm_bridge_connector_clear_spd_infoframe(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -582,11 +587,11 @@ static int drm_bridge_connector_clear_spd_infoframe(struct drm_connector *connec
static int drm_bridge_connector_write_spd_infoframe(struct drm_connector *connector,
const u8 *buffer, size_t len)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi;
+ bridge = dynconn->bridge_hdmi;
if (!bridge)
return -EINVAL;
@@ -596,11 +601,11 @@ static int drm_bridge_connector_write_spd_infoframe(struct drm_connector *connec
static const struct drm_edid *
drm_bridge_connector_read_edid(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_edid;
+ bridge = dynconn->bridge_edid;
if (!bridge)
return NULL;
@@ -638,12 +643,12 @@ static const struct drm_connector_infoframe_funcs drm_bridge_connector_hdmi_spd_
static int drm_bridge_connector_audio_startup(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- if (bridge_connector->bridge_hdmi_audio) {
- bridge = bridge_connector->bridge_hdmi_audio;
+ if (dynconn->bridge_hdmi_audio) {
+ bridge = dynconn->bridge_hdmi_audio;
if (!bridge->funcs->hdmi_audio_startup)
return 0;
@@ -651,8 +656,8 @@ static int drm_bridge_connector_audio_startup(struct drm_connector *connector)
return bridge->funcs->hdmi_audio_startup(bridge, connector);
}
- if (bridge_connector->bridge_dp_audio) {
- bridge = bridge_connector->bridge_dp_audio;
+ if (dynconn->bridge_dp_audio) {
+ bridge = dynconn->bridge_dp_audio;
if (!bridge->funcs->dp_audio_startup)
return 0;
@@ -667,18 +672,18 @@ static int drm_bridge_connector_audio_prepare(struct drm_connector *connector,
struct hdmi_codec_daifmt *fmt,
struct hdmi_codec_params *hparms)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- if (bridge_connector->bridge_hdmi_audio) {
- bridge = bridge_connector->bridge_hdmi_audio;
+ if (dynconn->bridge_hdmi_audio) {
+ bridge = dynconn->bridge_hdmi_audio;
return bridge->funcs->hdmi_audio_prepare(bridge, connector, fmt, hparms);
}
- if (bridge_connector->bridge_dp_audio) {
- bridge = bridge_connector->bridge_dp_audio;
+ if (dynconn->bridge_dp_audio) {
+ bridge = dynconn->bridge_dp_audio;
return bridge->funcs->dp_audio_prepare(bridge, connector, fmt, hparms);
}
@@ -688,17 +693,17 @@ static int drm_bridge_connector_audio_prepare(struct drm_connector *connector,
static void drm_bridge_connector_audio_shutdown(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- if (bridge_connector->bridge_hdmi_audio) {
- bridge = bridge_connector->bridge_hdmi_audio;
+ if (dynconn->bridge_hdmi_audio) {
+ bridge = dynconn->bridge_hdmi_audio;
bridge->funcs->hdmi_audio_shutdown(bridge, connector);
}
- if (bridge_connector->bridge_dp_audio) {
- bridge = bridge_connector->bridge_dp_audio;
+ if (dynconn->bridge_dp_audio) {
+ bridge = dynconn->bridge_dp_audio;
bridge->funcs->dp_audio_shutdown(bridge, connector);
}
}
@@ -706,12 +711,12 @@ static void drm_bridge_connector_audio_shutdown(struct drm_connector *connector)
static int drm_bridge_connector_audio_mute_stream(struct drm_connector *connector,
bool enable, int direction)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- if (bridge_connector->bridge_hdmi_audio) {
- bridge = bridge_connector->bridge_hdmi_audio;
+ if (dynconn->bridge_hdmi_audio) {
+ bridge = dynconn->bridge_hdmi_audio;
if (!bridge->funcs->hdmi_audio_mute_stream)
return -ENOTSUPP;
@@ -720,8 +725,8 @@ static int drm_bridge_connector_audio_mute_stream(struct drm_connector *connecto
enable, direction);
}
- if (bridge_connector->bridge_dp_audio) {
- bridge = bridge_connector->bridge_dp_audio;
+ if (dynconn->bridge_dp_audio) {
+ bridge = dynconn->bridge_dp_audio;
if (!bridge->funcs->dp_audio_mute_stream)
return -ENOTSUPP;
@@ -742,22 +747,22 @@ static const struct drm_connector_hdmi_audio_funcs drm_bridge_connector_hdmi_aud
static int drm_bridge_connector_hdmi_cec_enable(struct drm_connector *connector, bool enable)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi_cec;
+ bridge = dynconn->bridge_hdmi_cec;
return bridge->funcs->hdmi_cec_enable(bridge, enable);
}
static int drm_bridge_connector_hdmi_cec_log_addr(struct drm_connector *connector, u8 logical_addr)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi_cec;
+ bridge = dynconn->bridge_hdmi_cec;
return bridge->funcs->hdmi_cec_log_addr(bridge, logical_addr);
}
@@ -767,11 +772,11 @@ static int drm_bridge_connector_hdmi_cec_transmit(struct drm_connector *connecto
u32 signal_free_time,
struct cec_msg *msg)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi_cec;
+ bridge = dynconn->bridge_hdmi_cec;
return bridge->funcs->hdmi_cec_transmit(bridge, attempts,
signal_free_time,
@@ -780,11 +785,11 @@ static int drm_bridge_connector_hdmi_cec_transmit(struct drm_connector *connecto
static int drm_bridge_connector_hdmi_cec_init(struct drm_connector *connector)
{
- struct drm_bridge_connector *bridge_connector =
- to_drm_bridge_connector(connector);
+ struct drm_bridge_connector_dynconn *dynconn =
+ to_drm_bridge_connector_dynconn(connector);
struct drm_bridge *bridge;
- bridge = bridge_connector->bridge_hdmi_cec;
+ bridge = dynconn->bridge_hdmi_cec;
if (!bridge->funcs->hdmi_cec_init)
return 0;
@@ -821,7 +826,6 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector_dynconn
struct drm_bridge **panel_bridge,
bool *support_hdcp)
{
- struct drm_bridge_connector *bridge_connector = dynconn->bridge_connector;
struct drm_connector *connector = &dynconn->connector;
/*
@@ -831,7 +835,7 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector_dynconn
connector->ycbcr_420_allowed = true;
*connector_type = DRM_MODE_CONNECTOR_Unknown;
- drm_for_each_bridge_in_chain_scoped(bridge_connector->encoder, bridge) {
+ drm_for_each_bridge_in_chain_scoped(dynconn->bridge_connector->encoder, bridge) {
if (!bridge->interlace_allowed)
connector->interlace_allowed = false;
if (!bridge->ycbcr_420_allowed)
@@ -841,26 +845,26 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector_dynconn
* Ensure the last bridge declares OP_EDID or OP_MODES or both.
*/
if (bridge->ops & DRM_BRIDGE_OP_EDID || bridge->ops & DRM_BRIDGE_OP_MODES) {
- drm_bridge_put(bridge_connector->bridge_edid);
- bridge_connector->bridge_edid = NULL;
- drm_bridge_put(bridge_connector->bridge_modes);
- bridge_connector->bridge_modes = NULL;
+ drm_bridge_put(dynconn->bridge_edid);
+ dynconn->bridge_edid = NULL;
+ drm_bridge_put(dynconn->bridge_modes);
+ dynconn->bridge_modes = NULL;
if (bridge->ops & DRM_BRIDGE_OP_EDID)
- bridge_connector->bridge_edid = drm_bridge_get(bridge);
+ dynconn->bridge_edid = drm_bridge_get(bridge);
if (bridge->ops & DRM_BRIDGE_OP_MODES)
- bridge_connector->bridge_modes = drm_bridge_get(bridge);
+ dynconn->bridge_modes = drm_bridge_get(bridge);
}
if (bridge->ops & DRM_BRIDGE_OP_HPD) {
- drm_bridge_put(bridge_connector->bridge_hpd);
- bridge_connector->bridge_hpd = drm_bridge_get(bridge);
+ drm_bridge_put(dynconn->bridge_hpd);
+ dynconn->bridge_hpd = drm_bridge_get(bridge);
}
if (bridge->ops & DRM_BRIDGE_OP_DETECT) {
- drm_bridge_put(bridge_connector->bridge_detect);
- bridge_connector->bridge_detect = drm_bridge_get(bridge);
+ drm_bridge_put(dynconn->bridge_detect);
+ dynconn->bridge_detect = drm_bridge_get(bridge);
}
if (bridge->ops & DRM_BRIDGE_OP_HDMI) {
- if (bridge_connector->bridge_hdmi)
+ if (dynconn->bridge_hdmi)
return -EBUSY;
if (!bridge->funcs->hdmi_write_avi_infoframe ||
!bridge->funcs->hdmi_clear_avi_infoframe ||
@@ -883,7 +887,7 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector_dynconn
!bridge->funcs->hdmi_clear_spd_infoframe))
return -EINVAL;
- bridge_connector->bridge_hdmi = drm_bridge_get(bridge);
+ dynconn->bridge_hdmi = drm_bridge_get(bridge);
if (bridge->supported_formats)
*supported_formats = bridge->supported_formats;
@@ -892,10 +896,10 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector_dynconn
}
if (bridge->ops & DRM_BRIDGE_OP_HDMI_AUDIO) {
- if (bridge_connector->bridge_hdmi_audio)
+ if (dynconn->bridge_hdmi_audio)
return -EBUSY;
- if (bridge_connector->bridge_dp_audio)
+ if (dynconn->bridge_dp_audio)
return -EBUSY;
if (!bridge->hdmi_audio_max_i2s_playback_channels &&
@@ -906,14 +910,14 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector_dynconn
!bridge->funcs->hdmi_audio_shutdown)
return -EINVAL;
- bridge_connector->bridge_hdmi_audio = drm_bridge_get(bridge);
+ dynconn->bridge_hdmi_audio = drm_bridge_get(bridge);
}
if (bridge->ops & DRM_BRIDGE_OP_DP_AUDIO) {
- if (bridge_connector->bridge_dp_audio)
+ if (dynconn->bridge_dp_audio)
return -EBUSY;
- if (bridge_connector->bridge_hdmi_audio)
+ if (dynconn->bridge_hdmi_audio)
return -EBUSY;
if (!bridge->hdmi_audio_max_i2s_playback_channels &&
@@ -924,21 +928,21 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector_dynconn
!bridge->funcs->dp_audio_shutdown)
return -EINVAL;
- bridge_connector->bridge_dp_audio = drm_bridge_get(bridge);
+ dynconn->bridge_dp_audio = drm_bridge_get(bridge);
}
if (bridge->ops & DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER) {
- if (bridge_connector->bridge_hdmi_cec)
+ if (dynconn->bridge_hdmi_cec)
return -EBUSY;
- bridge_connector->bridge_hdmi_cec = drm_bridge_get(bridge);
+ dynconn->bridge_hdmi_cec = drm_bridge_get(bridge);
}
if (bridge->ops & DRM_BRIDGE_OP_HDMI_CEC_ADAPTER) {
- if (bridge_connector->bridge_hdmi_cec)
+ if (dynconn->bridge_hdmi_cec)
return -EBUSY;
- bridge_connector->bridge_hdmi_cec = drm_bridge_get(bridge);
+ dynconn->bridge_hdmi_cec = drm_bridge_get(bridge);
if (!bridge->funcs->hdmi_cec_enable ||
!bridge->funcs->hdmi_cec_log_addr ||
@@ -972,20 +976,20 @@ static int drm_bridge_connector_get_bridges(struct drm_bridge_connector_dynconn
return 0;
}
-static int drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector *bridge_connector)
+static int drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector_dynconn *dynconn)
{
- struct drm_connector *connector = &bridge_connector->dynconn->connector;
+ struct drm_connector *connector = &dynconn->connector;
int ret;
- if (bridge_connector->bridge_hdmi_audio ||
- bridge_connector->bridge_dp_audio) {
+ if (dynconn->bridge_hdmi_audio ||
+ dynconn->bridge_dp_audio) {
struct device *dev;
struct drm_bridge *bridge;
- if (bridge_connector->bridge_hdmi_audio)
- bridge = bridge_connector->bridge_hdmi_audio;
+ if (dynconn->bridge_hdmi_audio)
+ bridge = dynconn->bridge_hdmi_audio;
else
- bridge = bridge_connector->bridge_dp_audio;
+ bridge = dynconn->bridge_dp_audio;
dev = bridge->hdmi_audio_dev;
@@ -999,9 +1003,9 @@ static int drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector
return ret;
}
- if (bridge_connector->bridge_hdmi_cec &&
- bridge_connector->bridge_hdmi_cec->ops & DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER) {
- struct drm_bridge *bridge = bridge_connector->bridge_hdmi_cec;
+ if (dynconn->bridge_hdmi_cec &&
+ dynconn->bridge_hdmi_cec->ops & DRM_BRIDGE_OP_HDMI_CEC_NOTIFIER) {
+ struct drm_bridge *bridge = dynconn->bridge_hdmi_cec;
ret = drmm_connector_hdmi_cec_notifier_register(connector, NULL,
bridge->hdmi_cec_dev);
@@ -1009,9 +1013,9 @@ static int drm_bridge_connector_init_hdmi_audio_cec(struct drm_bridge_connector
return ret;
}
- if (bridge_connector->bridge_hdmi_cec &&
- bridge_connector->bridge_hdmi_cec->ops & DRM_BRIDGE_OP_HDMI_CEC_ADAPTER) {
- struct drm_bridge *bridge = bridge_connector->bridge_hdmi_cec;
+ if (dynconn->bridge_hdmi_cec &&
+ dynconn->bridge_hdmi_cec->ops & DRM_BRIDGE_OP_HDMI_CEC_ADAPTER) {
+ struct drm_bridge *bridge = dynconn->bridge_hdmi_cec;
ret = drmm_connector_hdmi_cec_register(connector,
&drm_bridge_connector_hdmi_cec_funcs,
@@ -1061,29 +1065,29 @@ static int drm_bridge_connector_add_connector(struct drm_bridge_connector *bridg
return ret;
}
- if (bridge_connector->bridge_hdmi) {
+ if (dynconn->bridge_hdmi) {
if (!connector->ycbcr_420_allowed)
supported_formats &= ~BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
- bridge_connector->hdmi_funcs = drm_bridge_connector_hdmi_funcs;
+ dynconn->hdmi_funcs = drm_bridge_connector_hdmi_funcs;
- if (bridge_connector->bridge_hdmi->ops & DRM_BRIDGE_OP_HDMI_AUDIO)
- bridge_connector->hdmi_funcs.audio =
+ if (dynconn->bridge_hdmi->ops & DRM_BRIDGE_OP_HDMI_AUDIO)
+ dynconn->hdmi_funcs.audio =
drm_bridge_connector_hdmi_audio_infoframe;
- if (bridge_connector->bridge_hdmi->ops & DRM_BRIDGE_OP_HDMI_HDR_DRM_INFOFRAME)
- bridge_connector->hdmi_funcs.hdr_drm =
+ if (dynconn->bridge_hdmi->ops & DRM_BRIDGE_OP_HDMI_HDR_DRM_INFOFRAME)
+ dynconn->hdmi_funcs.hdr_drm =
drm_bridge_connector_hdmi_hdr_drm_infoframe;
- if (bridge_connector->bridge_hdmi->ops & DRM_BRIDGE_OP_HDMI_SPD_INFOFRAME)
- bridge_connector->hdmi_funcs.spd =
+ if (dynconn->bridge_hdmi->ops & DRM_BRIDGE_OP_HDMI_SPD_INFOFRAME)
+ dynconn->hdmi_funcs.spd =
drm_bridge_connector_hdmi_spd_infoframe;
ret = drm_connector_hdmi_dynamic_init(bridge_connector->drm, connector,
- bridge_connector->bridge_hdmi->vendor,
- bridge_connector->bridge_hdmi->product,
+ dynconn->bridge_hdmi->vendor,
+ dynconn->bridge_hdmi->product,
&drm_bridge_connector_funcs,
- &bridge_connector->hdmi_funcs,
+ &dynconn->hdmi_funcs,
connector_type, ddc,
supported_formats,
max_bpc);
@@ -1093,7 +1097,7 @@ static int drm_bridge_connector_add_connector(struct drm_bridge_connector *bridg
connector_type, ddc);
}
if (ret) {
- drm_bridge_connector_put_bridges(dynconn->bridge_connector);
+ drm_bridge_connector_put_bridges(dynconn);
kfree(dynconn);
return ret;
}
@@ -1104,15 +1108,15 @@ static int drm_bridge_connector_add_connector(struct drm_bridge_connector *bridg
drm_bridge_connector_reset(connector);
- ret = drm_bridge_connector_init_hdmi_audio_cec(bridge_connector);
+ ret = drm_bridge_connector_init_hdmi_audio_cec(dynconn);
if (ret)
goto err_put;
drm_connector_helper_add(connector, &drm_bridge_connector_helper_funcs);
- if (bridge_connector->bridge_hpd)
+ if (dynconn->bridge_hpd)
connector->polled = DRM_CONNECTOR_POLL_HPD;
- else if (bridge_connector->bridge_detect)
+ else if (dynconn->bridge_detect)
connector->polled = DRM_CONNECTOR_POLL_CONNECT
| DRM_CONNECTOR_POLL_DISCONNECT;
--
2.54.0
next prev parent reply other threads:[~2026-05-19 10:39 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-19 10:37 [PATCH 00/37] drm bridge hotplug Luca Ceresoli
2026-05-19 10:37 ` [PATCH 01/37] drm/connector: split drmm_connector_hdmi_init() in 3 parts Luca Ceresoli
2026-05-19 10:37 ` [PATCH 02/37] drm/connector: add drm_connector_hdmi_dynamic_init() Luca Ceresoli
2026-05-19 10:37 ` [PATCH 03/37] drm/display: bridge-connector: rename variable for consistency Luca Ceresoli
2026-05-19 10:37 ` [PATCH 04/37] drm/display: bridge-connector: store the drm_device pointer Luca Ceresoli
2026-05-19 10:37 ` [PATCH 05/37] drm/display: bridge-connector: split code creating the connector to a subfunction Luca Ceresoli
2026-05-19 10:37 ` [PATCH 06/37] drm/display: bridge-connector: use a drm_bridge_connector internally, not a drm_connector Luca Ceresoli
2026-05-19 10:37 ` [PATCH 07/37] drm/display: bridge-connector: extract drm_bridge_connector_get_bridges() Luca Ceresoli
2026-05-19 10:37 ` [PATCH 08/37] drm/display: bridge-connector: return int from drm_bridge_connector_get_bridges() Luca Ceresoli
2026-05-19 10:37 ` [PATCH 09/37] drm/display: bridge-connector: extract drm_bridge_connector_init_hdmi_audio_cec() Luca Ceresoli
2026-05-19 10:37 ` [PATCH 10/37] drm/display: bridge-connector: return int from drm_bridge_connector_init_hdmi_audio_cec() Luca Ceresoli
2026-05-19 10:37 ` [PATCH 11/37] drm/display: bridge-connector: return int from drm_bridge_connector_add_connector() Luca Ceresoli
2026-05-19 10:37 ` [PATCH 12/37] drm/display: bridge-connector: hoist error management to common code Luca Ceresoli
2026-05-19 10:37 ` [PATCH 13/37] drm/display: bridge-connector: move drm_bridge_connector_put_bridges() definition eariler Luca Ceresoli
2026-05-19 10:37 ` [PATCH 14/37] drm/display: bridge-connector: add non-drmm variant of drm_bridge_connector_put_bridges() Luca Ceresoli
2026-05-19 10:37 ` [PATCH 15/37] drm/display: bridge-connector: allocate the connector dynamically Luca Ceresoli
2026-05-19 10:37 ` Luca Ceresoli [this message]
2026-05-19 10:37 ` [PATCH 17/37] drm/display: bridge-connector: protect dynconn creation and destruction with a mutex Luca Ceresoli
2026-05-19 10:37 ` [PATCH 18/37] drm/bridge: samsung-dsim: remove the panel_bridge on host_detach Luca Ceresoli
2026-05-19 10:37 ` [PATCH 19/37] drm/bridge: samsung-dsim: move drm_bridge_add() call to probe Luca Ceresoli
2026-05-19 10:37 ` [PATCH 20/37] drm/bridge: samsung-dsim: attach: return -EPROBE_DEFER is next bridge not yet available Luca Ceresoli
2026-05-19 10:37 ` [PATCH 21/37] drm/bridge: initialize chain_node list head on allocation Luca Ceresoli
2026-05-19 10:37 ` [PATCH 22/37] drm/bridge: initialize chain_node list head on detach and attach errors Luca Ceresoli
2026-05-19 10:37 ` [PATCH 23/37] drm/encoder: add drm_encoder_cleanup_from() Luca Ceresoli
2026-05-19 10:37 ` [PATCH 24/37] drm/atomic: move drm_atomic_helper_disable_all() and drm_atomic_helper_shutdown() from drm_atomic_helper to drm_atomic Luca Ceresoli
2026-05-19 10:37 ` [PATCH 25/37] drm/bridge: shutdown and cleanup on bridge unplug Luca Ceresoli
2026-05-19 10:37 ` [PATCH 26/37] drm: event-notifier: add mechanism to notify about hotplug events Luca Ceresoli
2026-05-19 10:37 ` [PATCH 27/37] drm/bridge: notify about detached bridges Luca Ceresoli
2026-05-19 10:37 ` [PATCH 28/37] drm/mipi-dsi: turn DRM_MIPI_DSI into a tristate Luca Ceresoli
2026-05-19 10:37 ` [PATCH 29/37] drm/mipi-dsi: notify about DSI attach Luca Ceresoli
2026-05-19 10:37 ` [PATCH 30/37] drm/bridge: add drm_bridge_is_tail() to know whether a bridge completes the pipeline Luca Ceresoli
2026-05-19 10:37 ` [PATCH 31/37] drm/bridge: panel: implement .is_tail Luca Ceresoli
2026-05-19 15:12 ` Neil Armstrong
2026-05-19 10:37 ` [PATCH 32/37] drm/bridge: display-connector: " Luca Ceresoli
2026-05-19 10:37 ` [PATCH 33/37] drm/bridge: samsung-dsim: " Luca Ceresoli
2026-05-19 10:37 ` [PATCH 34/37] drm/bridge: ti-sn65dsi83: " Luca Ceresoli
2026-05-19 10:37 ` [PATCH 35/37] drm/bridge: drm_bridge_attach(): don't fail on -EPROBE_DEFER Luca Ceresoli
2026-05-19 10:37 ` [PATCH 36/37] drm/display: bridge-connector: handle bridge hotplug Luca Ceresoli
2026-05-19 10:37 ` [PATCH 37/37] drm/mxsfb/lcdif: enable " Luca Ceresoli
2026-06-01 15:44 ` [PATCH 00/37] drm " Luca Ceresoli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260519-drm-bridge-hotplug-v1-16-45e2bdb3dfb4@bootlin.com \
--to=luca.ceresoli@bootlin$(echo .)com \
--cc=Frank.Li@nxp$(echo .)com \
--cc=Hui.Pu@gehealthcare$(echo .)com \
--cc=Laurent.pinchart@ideasonboard$(echo .)com \
--cc=airlied@gmail$(echo .)com \
--cc=andrzej.hajda@intel$(echo .)com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=festevam@gmail$(echo .)com \
--cc=ian.ray@gehealthcare$(echo .)com \
--cc=imx@lists$(echo .)linux.dev \
--cc=inki.dae@samsung$(echo .)com \
--cc=jagan@amarulasolutions$(echo .)com \
--cc=jernej.skrabec@gmail$(echo .)com \
--cc=jonas@kwiboo$(echo .)se \
--cc=kernel@pengutronix$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=m.szyprowski@samsung$(echo .)com \
--cc=maarten.lankhorst@linux$(echo .)intel.com \
--cc=marex@denx$(echo .)de \
--cc=mripard@kernel$(echo .)org \
--cc=neil.armstrong@linaro$(echo .)org \
--cc=rfoss@kernel$(echo .)org \
--cc=s.hauer@pengutronix$(echo .)de \
--cc=simona@ffwll$(echo .)ch \
--cc=stefan@agner$(echo .)ch \
--cc=thomas.petazzoni@bootlin$(echo .)com \
--cc=tzimmermann@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox