drm/i915/tc: Skip ref held check for TC legacy aux power wells

As part of ICL TC cold exit sequences we need to request aux power
well before lock the access to TC ports, so skiping the
intel_tc_port_ref_held() check for TC legacy ports.

Reviewed-by: Imre Deak <imre.deak@intel.com>
Tested-by: You-Sheng Yang <vicamo.yang@canonical.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200414194956.164323-5-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index c4043d665645cdb954cff8f3247e4e91a92e12c1..3a4a378792f28f6dd035807ba10e70ea000955ab 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -560,6 +560,9 @@ static void icl_tc_port_assert_ref_held(struct drm_i915_private *dev_priv,
        if (drm_WARN_ON(&dev_priv->drm, !dig_port))
                return;
 
+       if (INTEL_GEN(dev_priv) == 11 && dig_port->tc_legacy_port)
+               return;
+
        drm_WARN_ON(&dev_priv->drm, !intel_tc_port_ref_held(dig_port));
 }