Commit b298ba5f authored by José Roberto de Souza's avatar José Roberto de Souza Committed by Rodrigo Vivi

drm/i915/icl: Set TC type to unknown in the disconnection flow

Otherwise it would be in a inconsistent state as port is disconnected
but with a valid tc type.

Also setting it to unknown will earlier return
icl_tc_phy_disconnect() for any future calls to
intel_digital_port_connected(), this way we don't need to check if
port is marked as safe everytime.

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181030215750.28213-2-jose.souza@intel.com
parent 3e037f9b
...@@ -5102,21 +5102,24 @@ static void icl_tc_phy_disconnect(struct drm_i915_private *dev_priv, ...@@ -5102,21 +5102,24 @@ static void icl_tc_phy_disconnect(struct drm_i915_private *dev_priv,
struct intel_digital_port *dig_port) struct intel_digital_port *dig_port)
{ {
enum tc_port tc_port = intel_port_to_tc(dev_priv, dig_port->base.port); enum tc_port tc_port = intel_port_to_tc(dev_priv, dig_port->base.port);
u32 val;
if (dig_port->tc_type != TC_PORT_LEGACY && if (dig_port->tc_type == TC_PORT_UNKNOWN)
dig_port->tc_type != TC_PORT_TYPEC)
return; return;
/* /*
* This function may be called many times in a row without an HPD event * TBT disconnection flow is read the live status, what was done in
* in between, so try to avoid the write when we can. * caller.
*/ */
val = I915_READ(PORT_TX_DFLEXDPCSSS); if (dig_port->tc_type == TC_PORT_TYPEC ||
if (val & DP_PHY_MODE_STATUS_NOT_SAFE(tc_port)) { dig_port->tc_type == TC_PORT_LEGACY) {
u32 val;
val = I915_READ(PORT_TX_DFLEXDPCSSS);
val &= ~DP_PHY_MODE_STATUS_NOT_SAFE(tc_port); val &= ~DP_PHY_MODE_STATUS_NOT_SAFE(tc_port);
I915_WRITE(PORT_TX_DFLEXDPCSSS, val); I915_WRITE(PORT_TX_DFLEXDPCSSS, val);
} }
dig_port->tc_type = TC_PORT_UNKNOWN;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment