diff mbox series

[2/4] drm/i915/display: Replace intel_dp_set_infoframes() disable calls by dig_port->set_infoframes()

Message ID 20210514052843.9456-2-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/4] drm/i915/display: Nuke has_infoframe | expand

Commit Message

Souza, Jose May 14, 2021, 5:28 a.m. UTC 
Both do the same thing and this change help towards the goal of nuke
intel_dp_set_infoframes() completely.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_ddi.c    | 5 ++---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 5bc5528f3091..ba2f98881638 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2762,7 +2762,6 @@  static void intel_ddi_pre_enable(struct intel_atomic_state *state,
 					conn_state);
 
 		/* FIXME precompute everything properly */
-		/* FIXME how do we turn infoframes off again? */
 		if (dig_port->lspcon.active && dig_port->dp.has_hdmi_sink)
 			dig_port->set_infoframes(encoder, true, crtc_state,
 						 conn_state);
@@ -2811,8 +2810,8 @@  static void intel_ddi_post_disable_dp(struct intel_atomic_state *state,
 	enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
 
 	if (!is_mst)
-		intel_dp_set_infoframes(encoder, false, old_crtc_state,
-					old_conn_state);
+		dig_port->set_infoframes(encoder, false, old_crtc_state,
+					 old_conn_state);
 
 	/*
 	 * Power down sink before disabling the port, otherwise we end
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 1eb54f8ed51a..2866303279ed 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -435,8 +435,9 @@  static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 	 * the transcoder clock select is set to none.
 	 */
 	if (last_mst_stream)
-		intel_dp_set_infoframes(&dig_port->base, false, old_crtc_state,
-					old_conn_state);
+		dig_port->set_infoframes(&dig_port->base, false, old_crtc_state,
+					 old_conn_state);
+
 	/*
 	 * From TGL spec: "If multi-stream slave transcoder: Configure
 	 * Transcoder Clock Select to direct no clock to the transcoder"