diff mbox series

[20/29] drm/i915/tc: Add asserts in TC PHY hooks that the required power is on

Message ID 20230323142035.1432621-21-imre.deak@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/tc: Align the ADLP TypeC sequences with bspec | expand

Commit Message

Imre Deak March 23, 2023, 2:20 p.m. UTC
Add an assert to each TC PHY hook that their required power domain is
enabled.

While at it add a comment describing the domains used on each platform
and TC mode.

Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/display/intel_tc.c | 61 +++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

Comments

Jani Nikula March 23, 2023, 2:33 p.m. UTC | #1
On Thu, 23 Mar 2023, Imre Deak <imre.deak@intel.com> wrote:
> Add an assert to each TC PHY hook that their required power domain is
> enabled.
>
> While at it add a comment describing the domains used on each platform
> and TC mode.
>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_tc.c | 61 +++++++++++++++++++++++++
>  1 file changed, 61 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> index e68346c5e6036..7bcd93f1f0597 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -111,6 +111,46 @@ bool intel_tc_port_in_legacy_mode(struct intel_digital_port *dig_port)
>  	return intel_tc_port_in_mode(dig_port, TC_PORT_LEGACY);
>  }
>  
> +/**

This also shouldn't be a kernel-doc comment.

BR,
Jani.

> + * The display power domains used for TC ports depending on the
> + * platform and TC mode (legacy, DP-alt, TBT):
> + *
> + * POWER_DOMAIN_DISPLAY_CORE:
> + * --------------------------
> + * ADLP/all modes:
> + *   - TCSS/IOM access for PHY ready state.
> + * ADLP+/all modes:
> + *   - DE/north-,south-HPD ISR access for HPD live state.
> + *
> + * POWER_DOMAIN_PORT_DDI_LANES_<port>:
> + * -----------------------------------
> + * ICL+/all modes:
> + *   - DE/DDI_BUF access for port enabled state.
> + * ADLP/all modes:
> + *   - DE/DDI_BUF access for PHY owned state.
> + *
> + * POWER_DOMAIN_AUX_USBC<TC port index>:
> + * -------------------------------------
> + * ICL/legacy mode:
> + *   - TCSS/IOM,FIA access for PHY ready, owned and HPD live state
> + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> + *     main lanes.
> + * ADLP/legacy, DP-alt modes:
> + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> + *     main lanes.
> + *
> + * POWER_DOMAIN_TC_COLD_OFF:
> + * -------------------------
> + * TGL/legacy, DP-alt modes:
> + *   - TCSS/IOM,FIA access for PHY ready, owned and HPD live state
> + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> + *     main lanes.
> + *
> + * ICL, TGL, ADLP/TBT mode:
> + *   - TCSS/IOM,FIA access for HPD live state
> + *   - TCSS/TBT: block TC-cold power state for using the (TBT DP-IN)
> + *     AUX and main lanes.
> + */
>  bool intel_tc_cold_requires_aux_pw(struct intel_digital_port *dig_port)
>  {
>  	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> @@ -163,6 +203,15 @@ tc_cold_unblock(struct intel_tc_port *tc, intel_wakeref_t wakeref)
>  	__tc_cold_unblock(tc, domain, wakeref);
>  }
>  
> +static void
> +assert_display_core_power_enabled(struct intel_tc_port *tc)
> +{
> +	struct drm_i915_private *i915 = tc_to_i915(tc);
> +
> +	drm_WARN_ON(&i915->drm,
> +		    !intel_display_power_is_enabled(i915, POWER_DOMAIN_DISPLAY_CORE));
> +}
> +
>  static void
>  assert_tc_cold_blocked(struct intel_tc_port *tc)
>  {
> @@ -378,6 +427,8 @@ static bool icl_tc_phy_is_ready(struct intel_tc_port *tc)
>  	struct drm_i915_private *i915 = tc_to_i915(tc);
>  	u32 val;
>  
> +	assert_tc_cold_blocked(tc);
> +
>  	val = intel_de_read(i915, PORT_TX_DFLEXDPPMS(tc->phy_fia));
>  	if (val == 0xffffffff) {
>  		drm_dbg_kms(&i915->drm,
> @@ -395,6 +446,8 @@ static bool icl_tc_phy_take_ownership(struct intel_tc_port *tc,
>  	struct drm_i915_private *i915 = tc_to_i915(tc);
>  	u32 val;
>  
> +	assert_tc_cold_blocked(tc);
> +
>  	val = intel_de_read(i915, PORT_TX_DFLEXDPCSSS(tc->phy_fia));
>  	if (val == 0xffffffff) {
>  		drm_dbg_kms(&i915->drm,
> @@ -418,6 +471,8 @@ static bool icl_tc_phy_is_owned(struct intel_tc_port *tc)
>  	struct drm_i915_private *i915 = tc_to_i915(tc);
>  	u32 val;
>  
> +	assert_tc_cold_blocked(tc);
> +
>  	val = intel_de_read(i915, PORT_TX_DFLEXDPCSSS(tc->phy_fia));
>  	if (val == 0xffffffff) {
>  		drm_dbg_kms(&i915->drm,
> @@ -626,6 +681,8 @@ static bool adlp_tc_phy_is_ready(struct intel_tc_port *tc)
>  	enum tc_port tc_port = intel_port_to_tc(i915, tc->dig_port->base.port);
>  	u32 val;
>  
> +	assert_display_core_power_enabled(tc);
> +
>  	val = intel_de_read(i915, TCSS_DDI_STATUS(tc_port));
>  	if (val == 0xffffffff) {
>  		drm_dbg_kms(&i915->drm,
> @@ -643,6 +700,8 @@ static bool adlp_tc_phy_take_ownership(struct intel_tc_port *tc,
>  	struct drm_i915_private *i915 = tc_to_i915(tc);
>  	enum port port = tc->dig_port->base.port;
>  
> +	assert_tc_port_power_enabled(tc);
> +
>  	intel_de_rmw(i915, DDI_BUF_CTL(port), DDI_BUF_CTL_TC_PHY_OWNERSHIP,
>  		     take ? DDI_BUF_CTL_TC_PHY_OWNERSHIP : 0);
>  
> @@ -655,6 +714,8 @@ static bool adlp_tc_phy_is_owned(struct intel_tc_port *tc)
>  	enum port port = tc->dig_port->base.port;
>  	u32 val;
>  
> +	assert_tc_port_power_enabled(tc);
> +
>  	val = intel_de_read(i915, DDI_BUF_CTL(port));
>  	return val & DDI_BUF_CTL_TC_PHY_OWNERSHIP;
>  }
Imre Deak March 23, 2023, 5:08 p.m. UTC | #2
On Thu, Mar 23, 2023 at 04:33:54PM +0200, Jani Nikula wrote:
> On Thu, 23 Mar 2023, Imre Deak <imre.deak@intel.com> wrote:
> > Add an assert to each TC PHY hook that their required power domain is
> > enabled.
> >
> > While at it add a comment describing the domains used on each platform
> > and TC mode.
> >
> > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_tc.c | 61 +++++++++++++++++++++++++
> >  1 file changed, 61 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> > index e68346c5e6036..7bcd93f1f0597 100644
> > --- a/drivers/gpu/drm/i915/display/intel_tc.c
> > +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> > @@ -111,6 +111,46 @@ bool intel_tc_port_in_legacy_mode(struct intel_digital_port *dig_port)
> >  	return intel_tc_port_in_mode(dig_port, TC_PORT_LEGACY);
> >  }
> >  
> > +/**
> 
> This also shouldn't be a kernel-doc comment.

Ok, will change these.

> 
> BR,
> Jani.
> 
> > + * The display power domains used for TC ports depending on the
> > + * platform and TC mode (legacy, DP-alt, TBT):
> > + *
> > + * POWER_DOMAIN_DISPLAY_CORE:
> > + * --------------------------
> > + * ADLP/all modes:
> > + *   - TCSS/IOM access for PHY ready state.
> > + * ADLP+/all modes:
> > + *   - DE/north-,south-HPD ISR access for HPD live state.
> > + *
> > + * POWER_DOMAIN_PORT_DDI_LANES_<port>:
> > + * -----------------------------------
> > + * ICL+/all modes:
> > + *   - DE/DDI_BUF access for port enabled state.
> > + * ADLP/all modes:
> > + *   - DE/DDI_BUF access for PHY owned state.
> > + *
> > + * POWER_DOMAIN_AUX_USBC<TC port index>:
> > + * -------------------------------------
> > + * ICL/legacy mode:
> > + *   - TCSS/IOM,FIA access for PHY ready, owned and HPD live state
> > + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> > + *     main lanes.
> > + * ADLP/legacy, DP-alt modes:
> > + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> > + *     main lanes.
> > + *
> > + * POWER_DOMAIN_TC_COLD_OFF:
> > + * -------------------------
> > + * TGL/legacy, DP-alt modes:
> > + *   - TCSS/IOM,FIA access for PHY ready, owned and HPD live state
> > + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> > + *     main lanes.
> > + *
> > + * ICL, TGL, ADLP/TBT mode:
> > + *   - TCSS/IOM,FIA access for HPD live state
> > + *   - TCSS/TBT: block TC-cold power state for using the (TBT DP-IN)
> > + *     AUX and main lanes.
> > + */
> >  bool intel_tc_cold_requires_aux_pw(struct intel_digital_port *dig_port)
> >  {
> >  	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> > @@ -163,6 +203,15 @@ tc_cold_unblock(struct intel_tc_port *tc, intel_wakeref_t wakeref)
> >  	__tc_cold_unblock(tc, domain, wakeref);
> >  }
> >  
> > +static void
> > +assert_display_core_power_enabled(struct intel_tc_port *tc)
> > +{
> > +	struct drm_i915_private *i915 = tc_to_i915(tc);
> > +
> > +	drm_WARN_ON(&i915->drm,
> > +		    !intel_display_power_is_enabled(i915, POWER_DOMAIN_DISPLAY_CORE));
> > +}
> > +
> >  static void
> >  assert_tc_cold_blocked(struct intel_tc_port *tc)
> >  {
> > @@ -378,6 +427,8 @@ static bool icl_tc_phy_is_ready(struct intel_tc_port *tc)
> >  	struct drm_i915_private *i915 = tc_to_i915(tc);
> >  	u32 val;
> >  
> > +	assert_tc_cold_blocked(tc);
> > +
> >  	val = intel_de_read(i915, PORT_TX_DFLEXDPPMS(tc->phy_fia));
> >  	if (val == 0xffffffff) {
> >  		drm_dbg_kms(&i915->drm,
> > @@ -395,6 +446,8 @@ static bool icl_tc_phy_take_ownership(struct intel_tc_port *tc,
> >  	struct drm_i915_private *i915 = tc_to_i915(tc);
> >  	u32 val;
> >  
> > +	assert_tc_cold_blocked(tc);
> > +
> >  	val = intel_de_read(i915, PORT_TX_DFLEXDPCSSS(tc->phy_fia));
> >  	if (val == 0xffffffff) {
> >  		drm_dbg_kms(&i915->drm,
> > @@ -418,6 +471,8 @@ static bool icl_tc_phy_is_owned(struct intel_tc_port *tc)
> >  	struct drm_i915_private *i915 = tc_to_i915(tc);
> >  	u32 val;
> >  
> > +	assert_tc_cold_blocked(tc);
> > +
> >  	val = intel_de_read(i915, PORT_TX_DFLEXDPCSSS(tc->phy_fia));
> >  	if (val == 0xffffffff) {
> >  		drm_dbg_kms(&i915->drm,
> > @@ -626,6 +681,8 @@ static bool adlp_tc_phy_is_ready(struct intel_tc_port *tc)
> >  	enum tc_port tc_port = intel_port_to_tc(i915, tc->dig_port->base.port);
> >  	u32 val;
> >  
> > +	assert_display_core_power_enabled(tc);
> > +
> >  	val = intel_de_read(i915, TCSS_DDI_STATUS(tc_port));
> >  	if (val == 0xffffffff) {
> >  		drm_dbg_kms(&i915->drm,
> > @@ -643,6 +700,8 @@ static bool adlp_tc_phy_take_ownership(struct intel_tc_port *tc,
> >  	struct drm_i915_private *i915 = tc_to_i915(tc);
> >  	enum port port = tc->dig_port->base.port;
> >  
> > +	assert_tc_port_power_enabled(tc);
> > +
> >  	intel_de_rmw(i915, DDI_BUF_CTL(port), DDI_BUF_CTL_TC_PHY_OWNERSHIP,
> >  		     take ? DDI_BUF_CTL_TC_PHY_OWNERSHIP : 0);
> >  
> > @@ -655,6 +714,8 @@ static bool adlp_tc_phy_is_owned(struct intel_tc_port *tc)
> >  	enum port port = tc->dig_port->base.port;
> >  	u32 val;
> >  
> > +	assert_tc_port_power_enabled(tc);
> > +
> >  	val = intel_de_read(i915, DDI_BUF_CTL(port));
> >  	return val & DDI_BUF_CTL_TC_PHY_OWNERSHIP;
> >  }
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center
Kahola, Mika March 27, 2023, noon UTC | #3
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Imre
> Deak
> Sent: Thursday, March 23, 2023 7:08 PM
> To: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH 20/29] drm/i915/tc: Add asserts in TC PHY hooks
> that the required power is on
> 
> On Thu, Mar 23, 2023 at 04:33:54PM +0200, Jani Nikula wrote:
> > On Thu, 23 Mar 2023, Imre Deak <imre.deak@intel.com> wrote:
> > > Add an assert to each TC PHY hook that their required power domain
> > > is enabled.
> > >
> > > While at it add a comment describing the domains used on each
> > > platform and TC mode.
> > >
> > > Signed-off-by: Imre Deak <imre.deak@intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/display/intel_tc.c | 61
> > > +++++++++++++++++++++++++
> > >  1 file changed, 61 insertions(+)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_tc.c
> > > b/drivers/gpu/drm/i915/display/intel_tc.c
> > > index e68346c5e6036..7bcd93f1f0597 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_tc.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> > > @@ -111,6 +111,46 @@ bool intel_tc_port_in_legacy_mode(struct
> intel_digital_port *dig_port)
> > >  	return intel_tc_port_in_mode(dig_port, TC_PORT_LEGACY);  }
> > >
> > > +/**
> >
> > This also shouldn't be a kernel-doc comment.
> 
> Ok, will change these.

Functionality looks ok to me.

Reviewed-by: Mika Kahola <mika.kahola@intel.com>

> 
> >
> > BR,
> > Jani.
> >
> > > + * The display power domains used for TC ports depending on the
> > > + * platform and TC mode (legacy, DP-alt, TBT):
> > > + *
> > > + * POWER_DOMAIN_DISPLAY_CORE:
> > > + * --------------------------
> > > + * ADLP/all modes:
> > > + *   - TCSS/IOM access for PHY ready state.
> > > + * ADLP+/all modes:
> > > + *   - DE/north-,south-HPD ISR access for HPD live state.
> > > + *
> > > + * POWER_DOMAIN_PORT_DDI_LANES_<port>:
> > > + * -----------------------------------
> > > + * ICL+/all modes:
> > > + *   - DE/DDI_BUF access for port enabled state.
> > > + * ADLP/all modes:
> > > + *   - DE/DDI_BUF access for PHY owned state.
> > > + *
> > > + * POWER_DOMAIN_AUX_USBC<TC port index>:
> > > + * -------------------------------------
> > > + * ICL/legacy mode:
> > > + *   - TCSS/IOM,FIA access for PHY ready, owned and HPD live state
> > > + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> > > + *     main lanes.
> > > + * ADLP/legacy, DP-alt modes:
> > > + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> > > + *     main lanes.
> > > + *
> > > + * POWER_DOMAIN_TC_COLD_OFF:
> > > + * -------------------------
> > > + * TGL/legacy, DP-alt modes:
> > > + *   - TCSS/IOM,FIA access for PHY ready, owned and HPD live state
> > > + *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
> > > + *     main lanes.
> > > + *
> > > + * ICL, TGL, ADLP/TBT mode:
> > > + *   - TCSS/IOM,FIA access for HPD live state
> > > + *   - TCSS/TBT: block TC-cold power state for using the (TBT DP-IN)
> > > + *     AUX and main lanes.
> > > + */
> > >  bool intel_tc_cold_requires_aux_pw(struct intel_digital_port
> > > *dig_port)  {
> > >  	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> > > @@ -163,6 +203,15 @@ tc_cold_unblock(struct intel_tc_port *tc,
> intel_wakeref_t wakeref)
> > >  	__tc_cold_unblock(tc, domain, wakeref);  }
> > >
> > > +static void
> > > +assert_display_core_power_enabled(struct intel_tc_port *tc) {
> > > +	struct drm_i915_private *i915 = tc_to_i915(tc);
> > > +
> > > +	drm_WARN_ON(&i915->drm,
> > > +		    !intel_display_power_is_enabled(i915,
> > > +POWER_DOMAIN_DISPLAY_CORE)); }
> > > +
> > >  static void
> > >  assert_tc_cold_blocked(struct intel_tc_port *tc)  { @@ -378,6
> > > +427,8 @@ static bool icl_tc_phy_is_ready(struct intel_tc_port *tc)
> > >  	struct drm_i915_private *i915 = tc_to_i915(tc);
> > >  	u32 val;
> > >
> > > +	assert_tc_cold_blocked(tc);
> > > +
> > >  	val = intel_de_read(i915, PORT_TX_DFLEXDPPMS(tc->phy_fia));
> > >  	if (val == 0xffffffff) {
> > >  		drm_dbg_kms(&i915->drm,
> > > @@ -395,6 +446,8 @@ static bool icl_tc_phy_take_ownership(struct
> intel_tc_port *tc,
> > >  	struct drm_i915_private *i915 = tc_to_i915(tc);
> > >  	u32 val;
> > >
> > > +	assert_tc_cold_blocked(tc);
> > > +
> > >  	val = intel_de_read(i915, PORT_TX_DFLEXDPCSSS(tc->phy_fia));
> > >  	if (val == 0xffffffff) {
> > >  		drm_dbg_kms(&i915->drm,
> > > @@ -418,6 +471,8 @@ static bool icl_tc_phy_is_owned(struct intel_tc_port
> *tc)
> > >  	struct drm_i915_private *i915 = tc_to_i915(tc);
> > >  	u32 val;
> > >
> > > +	assert_tc_cold_blocked(tc);
> > > +
> > >  	val = intel_de_read(i915, PORT_TX_DFLEXDPCSSS(tc->phy_fia));
> > >  	if (val == 0xffffffff) {
> > >  		drm_dbg_kms(&i915->drm,
> > > @@ -626,6 +681,8 @@ static bool adlp_tc_phy_is_ready(struct
> intel_tc_port *tc)
> > >  	enum tc_port tc_port = intel_port_to_tc(i915, tc->dig_port->base.port);
> > >  	u32 val;
> > >
> > > +	assert_display_core_power_enabled(tc);
> > > +
> > >  	val = intel_de_read(i915, TCSS_DDI_STATUS(tc_port));
> > >  	if (val == 0xffffffff) {
> > >  		drm_dbg_kms(&i915->drm,
> > > @@ -643,6 +700,8 @@ static bool adlp_tc_phy_take_ownership(struct
> intel_tc_port *tc,
> > >  	struct drm_i915_private *i915 = tc_to_i915(tc);
> > >  	enum port port = tc->dig_port->base.port;
> > >
> > > +	assert_tc_port_power_enabled(tc);
> > > +
> > >  	intel_de_rmw(i915, DDI_BUF_CTL(port),
> DDI_BUF_CTL_TC_PHY_OWNERSHIP,
> > >  		     take ? DDI_BUF_CTL_TC_PHY_OWNERSHIP : 0);
> > >
> > > @@ -655,6 +714,8 @@ static bool adlp_tc_phy_is_owned(struct
> intel_tc_port *tc)
> > >  	enum port port = tc->dig_port->base.port;
> > >  	u32 val;
> > >
> > > +	assert_tc_port_power_enabled(tc);
> > > +
> > >  	val = intel_de_read(i915, DDI_BUF_CTL(port));
> > >  	return val & DDI_BUF_CTL_TC_PHY_OWNERSHIP;  }
> >
> > --
> > Jani Nikula, Intel Open Source Graphics Center
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index e68346c5e6036..7bcd93f1f0597 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -111,6 +111,46 @@  bool intel_tc_port_in_legacy_mode(struct intel_digital_port *dig_port)
 	return intel_tc_port_in_mode(dig_port, TC_PORT_LEGACY);
 }
 
+/**
+ * The display power domains used for TC ports depending on the
+ * platform and TC mode (legacy, DP-alt, TBT):
+ *
+ * POWER_DOMAIN_DISPLAY_CORE:
+ * --------------------------
+ * ADLP/all modes:
+ *   - TCSS/IOM access for PHY ready state.
+ * ADLP+/all modes:
+ *   - DE/north-,south-HPD ISR access for HPD live state.
+ *
+ * POWER_DOMAIN_PORT_DDI_LANES_<port>:
+ * -----------------------------------
+ * ICL+/all modes:
+ *   - DE/DDI_BUF access for port enabled state.
+ * ADLP/all modes:
+ *   - DE/DDI_BUF access for PHY owned state.
+ *
+ * POWER_DOMAIN_AUX_USBC<TC port index>:
+ * -------------------------------------
+ * ICL/legacy mode:
+ *   - TCSS/IOM,FIA access for PHY ready, owned and HPD live state
+ *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
+ *     main lanes.
+ * ADLP/legacy, DP-alt modes:
+ *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
+ *     main lanes.
+ *
+ * POWER_DOMAIN_TC_COLD_OFF:
+ * -------------------------
+ * TGL/legacy, DP-alt modes:
+ *   - TCSS/IOM,FIA access for PHY ready, owned and HPD live state
+ *   - TCSS/PHY: block TC-cold power state for using the PHY AUX and
+ *     main lanes.
+ *
+ * ICL, TGL, ADLP/TBT mode:
+ *   - TCSS/IOM,FIA access for HPD live state
+ *   - TCSS/TBT: block TC-cold power state for using the (TBT DP-IN)
+ *     AUX and main lanes.
+ */
 bool intel_tc_cold_requires_aux_pw(struct intel_digital_port *dig_port)
 {
 	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
@@ -163,6 +203,15 @@  tc_cold_unblock(struct intel_tc_port *tc, intel_wakeref_t wakeref)
 	__tc_cold_unblock(tc, domain, wakeref);
 }
 
+static void
+assert_display_core_power_enabled(struct intel_tc_port *tc)
+{
+	struct drm_i915_private *i915 = tc_to_i915(tc);
+
+	drm_WARN_ON(&i915->drm,
+		    !intel_display_power_is_enabled(i915, POWER_DOMAIN_DISPLAY_CORE));
+}
+
 static void
 assert_tc_cold_blocked(struct intel_tc_port *tc)
 {
@@ -378,6 +427,8 @@  static bool icl_tc_phy_is_ready(struct intel_tc_port *tc)
 	struct drm_i915_private *i915 = tc_to_i915(tc);
 	u32 val;
 
+	assert_tc_cold_blocked(tc);
+
 	val = intel_de_read(i915, PORT_TX_DFLEXDPPMS(tc->phy_fia));
 	if (val == 0xffffffff) {
 		drm_dbg_kms(&i915->drm,
@@ -395,6 +446,8 @@  static bool icl_tc_phy_take_ownership(struct intel_tc_port *tc,
 	struct drm_i915_private *i915 = tc_to_i915(tc);
 	u32 val;
 
+	assert_tc_cold_blocked(tc);
+
 	val = intel_de_read(i915, PORT_TX_DFLEXDPCSSS(tc->phy_fia));
 	if (val == 0xffffffff) {
 		drm_dbg_kms(&i915->drm,
@@ -418,6 +471,8 @@  static bool icl_tc_phy_is_owned(struct intel_tc_port *tc)
 	struct drm_i915_private *i915 = tc_to_i915(tc);
 	u32 val;
 
+	assert_tc_cold_blocked(tc);
+
 	val = intel_de_read(i915, PORT_TX_DFLEXDPCSSS(tc->phy_fia));
 	if (val == 0xffffffff) {
 		drm_dbg_kms(&i915->drm,
@@ -626,6 +681,8 @@  static bool adlp_tc_phy_is_ready(struct intel_tc_port *tc)
 	enum tc_port tc_port = intel_port_to_tc(i915, tc->dig_port->base.port);
 	u32 val;
 
+	assert_display_core_power_enabled(tc);
+
 	val = intel_de_read(i915, TCSS_DDI_STATUS(tc_port));
 	if (val == 0xffffffff) {
 		drm_dbg_kms(&i915->drm,
@@ -643,6 +700,8 @@  static bool adlp_tc_phy_take_ownership(struct intel_tc_port *tc,
 	struct drm_i915_private *i915 = tc_to_i915(tc);
 	enum port port = tc->dig_port->base.port;
 
+	assert_tc_port_power_enabled(tc);
+
 	intel_de_rmw(i915, DDI_BUF_CTL(port), DDI_BUF_CTL_TC_PHY_OWNERSHIP,
 		     take ? DDI_BUF_CTL_TC_PHY_OWNERSHIP : 0);
 
@@ -655,6 +714,8 @@  static bool adlp_tc_phy_is_owned(struct intel_tc_port *tc)
 	enum port port = tc->dig_port->base.port;
 	u32 val;
 
+	assert_tc_port_power_enabled(tc);
+
 	val = intel_de_read(i915, DDI_BUF_CTL(port));
 	return val & DDI_BUF_CTL_TC_PHY_OWNERSHIP;
 }