Skip to content

Commit 3d35ddf

Browse files
committed
drm/display/dp_mst: drop has_audio from struct drm_dp_mst_port
Caching the has_audio in struct drm_dp_mst_port seems odd, and oddly placed. Defer audio handling to drivers, and use the info from the connector display info. i915 was the only one using it anyway. Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/7d9eefdf150870479c5797f027d4c2b0a19ff583.1685437500.git.jani.nikula@intel.com
1 parent 0374ffa commit 3d35ddf

4 files changed

Lines changed: 4 additions & 9 deletions

File tree

drivers/gpu/drm/display/drm_dp_mst_topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4170,7 +4170,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_
41704170
else {
41714171
edid = drm_get_edid(connector, &port->aux.ddc);
41724172
}
4173-
port->has_audio = drm_detect_monitor_audio(edid);
4173+
41744174
drm_dp_mst_topology_put_port(port);
41754175
return edid;
41764176
}

drivers/gpu/drm/i915/display/intel_display_debugfs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ static void intel_dp_info(struct seq_file *m,
244244
}
245245

246246
static void intel_dp_mst_info(struct seq_file *m,
247-
struct intel_connector *intel_connector)
247+
struct intel_connector *connector)
248248
{
249-
bool has_audio = intel_connector->port->has_audio;
249+
bool has_audio = connector->base.display_info.has_audio;
250250

251251
seq_printf(m, "\taudio support: %s\n", str_yes_no(has_audio));
252252
}

drivers/gpu/drm/i915/display/intel_dp_mst.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static bool intel_dp_mst_has_audio(const struct drm_connector_state *conn_state)
298298
to_intel_connector(conn_state->connector);
299299

300300
if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
301-
return connector->port->has_audio;
301+
return connector->base.display_info.has_audio;
302302
else
303303
return intel_conn_state->force_audio == HDMI_AUDIO_ON;
304304
}

include/drm/display/drm_dp_mst_helper.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ struct drm_dp_mst_port {
139139
* that the EDID for all connectors is read immediately.
140140
*/
141141
struct edid *cached_edid;
142-
/**
143-
* @has_audio: Tracks whether the sink connector to this port is
144-
* audio-capable.
145-
*/
146-
bool has_audio;
147142

148143
/**
149144
* @fec_capable: bool indicating if FEC can be supported up to that

0 commit comments

Comments
 (0)