From: José Roberto de Souza Date: Tue, 14 Apr 2020 19:49:53 +0000 (-0700) Subject: drm/i915/tc: Skip ref held check for TC legacy aux power wells X-Git-Tag: v5.8-rc1~194^2~12^2~98 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ce40a671538c225ea8eb170830cad90b16ec211;p=thirdparty%2Fkernel%2Flinux.git 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 Tested-by: You-Sheng Yang Signed-off-by: José Roberto de Souza 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 c4043d665645c..3a4a378792f28 100644 --- 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)); }