[Intel-gfx] [PATCH 10/13] drm/i915/icl/tc: Remove the ICL special casing during TC-cold blocking

[Souza, Jose]

On Tue, 2021-09-28 at 13:52 +0300, Imre Deak wrote:
> On Tue, Sep 28, 2021 at 01:02:21AM +0300, Souza, Jose wrote:
> > On Tue, 2021-09-21 at 03:23 +0300, Imre Deak wrote:
> > > While a TypeC port mode is locked a DISPLAY_CORE power domain reference
> > > is held, which implies a runtime PM ref. By removing the ICL !legacy
> > > port special casing, a TC_COLD_OFF power domain reference will be taken
> > > for such ports, which also translates to a runtime PM ref on that
> > > platform. A follow-up change will stop holding the DISPLAY_CORE power
> > > domain while the port is locked.
> > 
> > This should be squashed to 'drm/i915/tc: Refactor TC-cold
> > block/unblock helpers' otherwise domain is not initialized for this
> > case.
> 
> domain is always only valid with a non-zero wakeref, so no need to init
> domain if the returned wakeref is zero.

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> 
> > > Cc: José Roberto de Souza <jose.souza at intel.com>
> > > Signed-off-by: Imre Deak <imre.deak at intel.com>
> > > ---
> > >  drivers/gpu/drm/i915/display/intel_tc.c | 6 ------
> > >  1 file changed, 6 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
> > > index b2a3d297bfc19..8d799cf7ccefd 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_tc.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> > > @@ -71,9 +71,6 @@ tc_cold_block_in_mode(struct intel_digital_port *dig_port, enum tc_port_mode mod
> > >  {
> > >  	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> > >  
> > > -	if (DISPLAY_VER(i915) == 11 && !dig_port->tc_legacy_port)
> > > -		return 0;
> > > -
> > >  	*domain = tc_cold_get_power_domain(dig_port, mode);
> > >  
> > >  	return intel_display_power_get(i915, *domain);
> > > @@ -108,9 +105,6 @@ assert_tc_cold_blocked(struct intel_digital_port *dig_port)
> > >  	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> > >  	bool enabled;
> > >  
> > > -	if (DISPLAY_VER(i915) == 11 && !dig_port->tc_legacy_port)
> > > -		return;
> > > -
> > >  	enabled = intel_display_power_is_enabled(i915,
> > >  						 tc_cold_get_power_domain(dig_port,
> > >  									  dig_port->tc_mode));
> >