Commit 3d35ddfb authored May 30, 2023 by Jani Nikula

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

parent 0374ffa5

drivers/gpu/drm/display/drm_dp_mst_topology.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4170,7 +4170,7 @@ struct edid drm_dp_mst_get_edid(struct drm_connector connector, struct drm_dp_
		else {
		edid = drm_get_edid(connector, &port->aux.ddc);
		}
		port->has_audio = drm_detect_monitor_audio(edid);

		drm_dp_mst_topology_put_port(port);
		return edid;
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -244,9 +244,9 @@ static void intel_dp_info(struct seq_file *m,
		}

		static void intel_dp_mst_info(struct seq_file *m,
		struct intel_connector *intel_connector)
		struct intel_connector *connector)
		{
		bool has_audio = intel_connector->port->has_audio;
		bool has_audio = connector->base.display_info.has_audio;

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -298,7 +298,7 @@ static bool intel_dp_mst_has_audio(const struct drm_connector_state *conn_state)
		to_intel_connector(conn_state->connector);

		if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO)
		return connector->port->has_audio;
		return connector->base.display_info.has_audio;
		else
		return intel_conn_state->force_audio == HDMI_AUDIO_ON;
		}

include/drm/display/drm_dp_mst_helper.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -139,11 +139,6 @@ struct drm_dp_mst_port {
		* that the EDID for all connectors is read immediately.
		*/
		struct edid *cached_edid;
		/**
		* @has_audio: Tracks whether the sink connector to this port is
		* audio-capable.
		*/
		bool has_audio;

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