[SRU][OEM-5.6][PATCH 5/8] drm/i915/tc: Skip ref held check for TC legacy aux power wells
You-Sheng Yang
vicamo.yang at canonical.com
Wed Apr 22 07:17:09 UTC 2020
From: José Roberto de Souza <jose.souza at intel.com>
BugLink: https://bugs.launchpad.net/bugs/1868936
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 at intel.com>
Tested-by: You-Sheng Yang <vicamo.yang at canonical.com>
Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200414194956.164323-5-jose.souza@intel.com
(backported from drm-tip commit 7ce40a671538c225ea8eb170830cad90b16ec211)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
drivers/gpu/drm/i915/display/intel_display_power.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index e437ed4f1a97..31a66d9bd996 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -551,6 +551,9 @@ static void icl_tc_port_assert_ref_held(struct drm_i915_private *dev_priv,
if (WARN_ON(!dig_port))
return;
+ if (INTEL_GEN(dev_priv) == 11 && dig_port->tc_legacy_port)
+ return;
+
WARN_ON(!intel_tc_port_ref_held(dig_port));
}
--
2.25.1
More information about the kernel-team
mailing list