drm/i915/tc: Don't keep legacy TypeC ports in connected state w/o a sink

A follow-up patch will disconnect/reconnect PHYs around AUX transfers
and modeset enable/disables. To prepare for that and make things
consistent for all TypeC modes stop connecting the PHY in legacy mode
without a sink being connected. This was done before since in legacy
mode the PHY is dedicated to display usage, so there was no point in
disconnecting it. However after the follow-up changes the TC-cold
blocking power domains will be held as long as the PHY is in the
connected state, so we'll need to disconnect/re-connect the PHY in all
TypeC modes to allow for power saving.

Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210921002313.1132357-7-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index f9242056693e5a2373c1c89c0c9ae64a1890cca1..6d0a1b376767a7f847af028700aa84c53fbff66d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -527,8 +527,6 @@ static void icl_tc_phy_disconnect(struct intel_digital_port *dig_port)
 {
        switch (dig_port->tc_mode) {
        case TC_PORT_LEGACY:
-               /* Nothing to do, we never disconnect from legacy mode */
-               break;
        case TC_PORT_DP_ALT:
                tc_phy_take_ownership(dig_port, false);
                dig_port->tc_mode = TC_PORT_TBT_ALT;
@@ -596,9 +594,7 @@ intel_tc_port_get_target_mode(struct intel_digital_port *dig_port)
        if (live_status_mask)
                return fls(live_status_mask) - 1;
 
-       return tc_phy_status_complete(dig_port) &&
-              dig_port->tc_legacy_port ? TC_PORT_LEGACY :
-                                         TC_PORT_TBT_ALT;
+       return TC_PORT_TBT_ALT;
 }
 
 static void intel_tc_port_reset_mode(struct intel_digital_port *dig_port,
@@ -659,14 +655,8 @@ void intel_tc_port_sanitize(struct intel_digital_port *dig_port)
                                    "Port %s: PHY disconnected with %d active link(s)\n",
                                    dig_port->tc_port_name, active_links);
                intel_tc_port_link_init_refcount(dig_port, active_links);
-
-               goto out;
        }
 
-       if (dig_port->tc_legacy_port)
-               icl_tc_phy_connect(dig_port, 1);
-
-out:
        drm_dbg_kms(&i915->drm, "Port %s: sanitize mode (%s)\n",
                    dig_port->tc_port_name,
                    tc_port_mode_name(dig_port->tc_mode));