drm/i915/dp_mst: Rename intel_dp_mst_encoder_active_links() to intel_dp_mst_active_st...

It's not clear which encoder intel_dp_mst_encoder_active_links() refers
to (primary/stream), but there is also no reason to call the queried
property an encoder property; remove encoder from the name. Also it's
the number of MST streams being queried, vs. the number of MST links
(there is one MST link carrying one or more MST streams), so rename link
to stream as well.

While at it pass intel_dp to the function, which is more logical and
makes it easier to re-use the function later (without the need to get
the digital port pointer).

Also move the function earlier, next to the related ones.

Suggested-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/20250404150310.1156696-5-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index f381ceb59c7d4ec3c7c2cc529ff878c5e2769903..b48ed5df7a9671362be0aef9af8ce1198ab51fba 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -877,7 +877,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,
                            encoder->base.base.id, encoder->base.name);
 
        if (!mst_pipe_mask && dp128b132b_pipe_mask) {
-               struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
+               struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
 
                /*
                 * If we don't have 8b/10b MST, but have more than one
@@ -890,7 +890,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,
                 * can assume it's SST.
                 */
                if (hweight8(dp128b132b_pipe_mask) > 1 ||
-                   intel_dp_mst_encoder_active_links(dig_port))
+                   intel_dp_mst_active_streams(intel_dp))
                        mst_pipe_mask = dp128b132b_pipe_mask;
        }
 
@@ -4109,13 +4109,13 @@ static void intel_ddi_read_func_ctl(struct intel_encoder *encoder,
        } else if (ddi_mode == TRANS_DDI_MODE_SELECT_DP_MST) {
                intel_ddi_read_func_ctl_dp_mst(encoder, pipe_config, ddi_func_ctl);
        } else if (ddi_mode == TRANS_DDI_MODE_SELECT_FDI_OR_128B132B && HAS_DP20(display)) {
-               struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
+               struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
 
                /*
                 * If this is true, we know we're being called from mst stream
                 * encoder's ->get_config().
                 */
-               if (intel_dp_mst_encoder_active_links(dig_port))
+               if (intel_dp_mst_active_streams(intel_dp))
                        intel_ddi_read_func_ctl_dp_mst(encoder, pipe_config, ddi_func_ctl);
                else
                        intel_ddi_read_func_ctl_dp_sst(encoder, pipe_config, ddi_func_ctl);

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 8084e7e8cf1146848011ca368f2ebd42b2382e7e..2a4bbe692558dcfe26a6f26f6390ca713653b7b5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -105,6 +105,11 @@ static struct intel_dp *to_primary_dp(struct intel_encoder *encoder)
        return &dig_port->dp;
 }
 
+int intel_dp_mst_active_streams(struct intel_dp *intel_dp)
+{
+       return intel_dp->mst.active_links;
+}
+
 static bool intel_dp_mst_dec_active_streams(struct intel_dp *intel_dp)
 {
        struct intel_display *display = to_intel_display(intel_dp);
@@ -1887,12 +1892,6 @@ mst_stream_encoders_create(struct intel_digital_port *dig_port)
        return true;
 }
 
-int
-intel_dp_mst_encoder_active_links(struct intel_digital_port *dig_port)
-{
-       return dig_port->dp.mst.active_links;
-}
-
 int
 intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id)
 {

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.h b/drivers/gpu/drm/i915/display/intel_dp_mst.h
index c1bbfeb02ca9e7afb96156f58143275225245956..ab09b487c6bb5e4f8ed481e573322a23efb93e2f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.h
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.h
@@ -18,7 +18,7 @@ struct intel_link_bw_limits;
 
 int intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_id);
 void intel_dp_mst_encoder_cleanup(struct intel_digital_port *dig_port);
-int intel_dp_mst_encoder_active_links(struct intel_digital_port *dig_port);
+int intel_dp_mst_active_streams(struct intel_dp *intel_dp);
 bool intel_dp_mst_is_master_trans(const struct intel_crtc_state *crtc_state);
 bool intel_dp_mst_is_slave_trans(const struct intel_crtc_state *crtc_state);
 bool intel_dp_mst_source_support(struct intel_dp *intel_dp);

diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 2c6c18434a4ca777acecdf298b3751b147857748..c1014e74791faa8a2298d0816d0183a6ced5d135 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -1547,28 +1547,28 @@ void intel_tc_port_init_mode(struct intel_digital_port *dig_port)
        mutex_unlock(&tc->lock);
 }
 
-static bool tc_port_has_active_links(struct intel_tc_port *tc,
-                                    const struct intel_crtc_state *crtc_state)
+static bool tc_port_has_active_streams(struct intel_tc_port *tc,
+                                      const struct intel_crtc_state *crtc_state)
 {
        struct intel_display *display = to_intel_display(tc->dig_port);
        struct intel_digital_port *dig_port = tc->dig_port;
        enum icl_port_dpll_id pll_type = ICL_PORT_DPLL_DEFAULT;
-       int active_links = 0;
+       int active_streams = 0;
 
        if (dig_port->dp.is_mst) {
                /* TODO: get the PLL type for MST, once HW readout is done for it. */
-               active_links = intel_dp_mst_encoder_active_links(dig_port);
+               active_streams = intel_dp_mst_active_streams(&dig_port->dp);
        } else if (crtc_state && crtc_state->hw.active) {
                pll_type = intel_ddi_port_pll_type(&dig_port->base, crtc_state);
-               active_links = 1;
+               active_streams = 1;
        }
 
-       if (active_links && !tc_phy_is_connected(tc, pll_type))
+       if (active_streams && !tc_phy_is_connected(tc, pll_type))
                drm_err(display->drm,
-                       "Port %s: PHY disconnected with %d active link(s)\n",
-                       tc->port_name, active_links);
+                       "Port %s: PHY disconnected with %d active stream(s)\n",
+                       tc->port_name, active_streams);
 
-       return active_links;
+       return active_streams;
 }
 
 /**
@@ -1592,7 +1592,7 @@ void intel_tc_port_sanitize_mode(struct intel_digital_port *dig_port,
        mutex_lock(&tc->lock);
 
        drm_WARN_ON(display->drm, tc->link_refcount != 1);
-       if (!tc_port_has_active_links(tc, crtc_state)) {
+       if (!tc_port_has_active_streams(tc, crtc_state)) {
                /*
                 * TBT-alt is the default mode in any case the PHY ownership is not
                 * held (regardless of the sink's connected live state), so