On Thu, Mar 16, 2023 at 03:17:23PM +0200, Imre Deak wrote:
> For clarity factor out the function to determine if there are active
> links on a TC port. This prepares for the next patch also checking the
> port's PLL type.
>
> No functional changes.
>
> Signed-off-by: Imre Deak <[email protected]>
> ---
> drivers/gpu/drm/i915/display/intel_tc.c | 35 ++++++++++++++++---------
> 1 file changed, 22 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c
> b/drivers/gpu/drm/i915/display/intel_tc.c
> index 5d040f0c5f630..8481018d0fdaa 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -872,6 +872,27 @@ void intel_tc_port_init_mode(struct intel_digital_port
> *dig_port)
> mutex_unlock(&dig_port->tc_lock);
> }
>
> +static bool tc_port_has_active_links(struct intel_digital_port *dig_port)
> +{
> + struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> + struct intel_encoder *encoder = &dig_port->base;
> + struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> + int active_links = 0;
> +
> + if (dig_port->dp.is_mst) {
> + active_links = intel_dp_mst_encoder_active_links(dig_port);
> + } else if (crtc && crtc->active) {
Uff. Can we get rid of this legacy encoder->crtc and crtc->active usage?
> + active_links = 1;
> + }
> +
> + if (active_links && !icl_tc_phy_is_connected(dig_port))
> + drm_err(&i915->drm,
> + "Port %s: PHY disconnected with %d active link(s)\n",
> + dig_port->tc_port_name, active_links);
> +
> + return active_links;
> +}
> +
> /**
> * intel_tc_port_sanitize_mode: Sanitize the given port's TypeC mode
> * @dig_port: digital port
> @@ -885,23 +906,11 @@ void intel_tc_port_init_mode(struct intel_digital_port
> *dig_port)
> void intel_tc_port_sanitize_mode(struct intel_digital_port *dig_port)
> {
> struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> - struct intel_encoder *encoder = &dig_port->base;
> - int active_links = 0;
>
> mutex_lock(&dig_port->tc_lock);
>
> - if (dig_port->dp.is_mst)
> - active_links = intel_dp_mst_encoder_active_links(dig_port);
> - else if (encoder->base.crtc)
> - active_links = to_intel_crtc(encoder->base.crtc)->active;
> -
> drm_WARN_ON(&i915->drm, dig_port->tc_link_refcount != 1);
> - if (active_links) {
> - if (!icl_tc_phy_is_connected(dig_port))
> - drm_dbg_kms(&i915->drm,
> - "Port %s: PHY disconnected with %d active
> link(s)\n",
> - dig_port->tc_port_name, active_links);
> - } else {
> + if (!tc_port_has_active_links(dig_port)) {
> /*
> * TBT-alt is the default mode in any case the PHY ownership is
> not
> * held (regardless of the sink's connected live state), so
> --
> 2.37.1
--
Ville Syrjälä
Intel
