On Wed, Nov 02, 2022 at 07:15:26PM +0200, Imre Deak wrote:
> Starting with TGL eDP is supported on ports B+ (besides port A), so make
> sure DC states are not blocked on any such ports. For this add an
> AUX_IO_<port> power domain for each port with eDP support. These domains
> similarly to AUX_IO_A enable only the AUX_IO_<port> power well for an
> enabled port, whereas the existing AUX_<port> domains enable both the
> AUX_IO_<port> and the DC_OFF power wells as required by DP AUX transfers.
>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 8 ++-
> .../drm/i915/display/intel_display_power.c | 30 +++++++++++
> .../drm/i915/display/intel_display_power.h | 7 +++
> .../i915/display/intel_display_power_map.c | 53 +++++++++++++++++--
> 4 files changed, 91 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index e95bde5cf060e..00b577a5b9a76 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -848,6 +848,8 @@ bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
> static enum intel_display_power_domain
> intel_ddi_main_link_aux_domain(struct intel_digital_port *dig_port)
> {
> + struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> +
> /* ICL+ HW requires corresponding AUX IOs to be powered up for PSR with
> * DC states enabled at the same time, while for driver initiated AUX
> * transfers we need the same AUX IOs to be powered but with DC states
> @@ -860,8 +862,10 @@ intel_ddi_main_link_aux_domain(struct intel_digital_port *dig_port)
> * Note that PSR is enabled only on Port A even though this function
> * returns the correct domain for other ports too.
> */
> - return dig_port->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A :
> - intel_aux_power_domain(dig_port);
> + if (intel_dp_is_edp(&dig_port->dp))
> + return intel_display_power_aux_io_domain(i915, dig_port->aux_ch);
> + else
> + return intel_aux_power_domain(dig_port);
This seems to have two distinct changes in it:
1) define more AUX_IO domains
2) don't use AUX_IO for external DP and instead use the full AUX domain
So seems like this needs to be split. Also why do we need 2)?
> }
>
> static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index da0047359446e..ca453518e7fd7 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -131,6 +131,16 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)
> return "AUDIO_PLAYBACK";
> case POWER_DOMAIN_AUX_IO_A:
> return "AUX_IO_A";
> + case POWER_DOMAIN_AUX_IO_B:
> + return "AUX_IO_B";
> + case POWER_DOMAIN_AUX_IO_C:
> + return "AUX_IO_C";
> + case POWER_DOMAIN_AUX_IO_D:
> + return "AUX_IO_D";
> + case POWER_DOMAIN_AUX_IO_E:
> + return "AUX_IO_E";
> + case POWER_DOMAIN_AUX_IO_F:
> + return "AUX_IO_F";
> case POWER_DOMAIN_AUX_A:
> return "AUX_A";
> case POWER_DOMAIN_AUX_B:
> @@ -2332,6 +2342,7 @@ struct intel_ddi_port_domains {
>
> enum intel_display_power_domain ddi_lanes;
> enum intel_display_power_domain ddi_io;
> + enum intel_display_power_domain aux_io;
> enum intel_display_power_domain aux_legacy_usbc;
> enum intel_display_power_domain aux_tbt;
> };
> @@ -2346,6 +2357,7 @@ i9xx_port_domains[] = {
>
> .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_A,
> .ddi_io = POWER_DOMAIN_PORT_DDI_IO_A,
> + .aux_io = POWER_DOMAIN_AUX_IO_A,
> .aux_legacy_usbc = POWER_DOMAIN_AUX_A,
> .aux_tbt = POWER_DOMAIN_INVALID,
> },
> @@ -2361,6 +2373,7 @@ d11_port_domains[] = {
>
> .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_A,
> .ddi_io = POWER_DOMAIN_PORT_DDI_IO_A,
> + .aux_io = POWER_DOMAIN_AUX_IO_A,
> .aux_legacy_usbc = POWER_DOMAIN_AUX_A,
> .aux_tbt = POWER_DOMAIN_INVALID,
> }, {
> @@ -2371,6 +2384,7 @@ d11_port_domains[] = {
>
> .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_C,
> .ddi_io = POWER_DOMAIN_PORT_DDI_IO_C,
> + .aux_io = POWER_DOMAIN_AUX_IO_C,
> .aux_legacy_usbc = POWER_DOMAIN_AUX_C,
> .aux_tbt = POWER_DOMAIN_AUX_TBT1,
> },
> @@ -2386,6 +2400,7 @@ d12_port_domains[] = {
>
> .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_A,
> .ddi_io = POWER_DOMAIN_PORT_DDI_IO_A,
> + .aux_io = POWER_DOMAIN_AUX_IO_A,
> .aux_legacy_usbc = POWER_DOMAIN_AUX_A,
> .aux_tbt = POWER_DOMAIN_INVALID,
> }, {
> @@ -2396,6 +2411,7 @@ d12_port_domains[] = {
>
> .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_TC1,
> .ddi_io = POWER_DOMAIN_PORT_DDI_IO_TC1,
> + .aux_io = POWER_DOMAIN_INVALID,
> .aux_legacy_usbc = POWER_DOMAIN_AUX_USBC1,
> .aux_tbt = POWER_DOMAIN_AUX_TBT1,
> },
> @@ -2411,6 +2427,7 @@ d13_port_domains[] = {
>
> .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_A,
> .ddi_io = POWER_DOMAIN_PORT_DDI_IO_A,
> + .aux_io = POWER_DOMAIN_AUX_IO_A,
> .aux_legacy_usbc = POWER_DOMAIN_AUX_A,
> .aux_tbt = POWER_DOMAIN_INVALID,
> }, {
> @@ -2421,6 +2438,7 @@ d13_port_domains[] = {
>
> .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_TC1,
> .ddi_io = POWER_DOMAIN_PORT_DDI_IO_TC1,
> + .aux_io = POWER_DOMAIN_INVALID,
> .aux_legacy_usbc = POWER_DOMAIN_AUX_USBC1,
> .aux_tbt = POWER_DOMAIN_AUX_TBT1,
> }, {
> @@ -2431,6 +2449,7 @@ d13_port_domains[] = {
>
> .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_D,
> .ddi_io = POWER_DOMAIN_PORT_DDI_IO_D,
> + .aux_io = POWER_DOMAIN_AUX_IO_D,
> .aux_legacy_usbc = POWER_DOMAIN_AUX_D,
> .aux_tbt = POWER_DOMAIN_INVALID,
> },
> @@ -2508,6 +2527,17 @@ intel_port_domains_for_aux_ch(struct drm_i915_private *i915, enum aux_ch aux_ch)
> return NULL;
> }
>
> +enum intel_display_power_domain
> +intel_display_power_aux_io_domain(struct drm_i915_private *i915, enum aux_ch aux_ch)
> +{
> + const struct intel_ddi_port_domains *domains = intel_port_domains_for_aux_ch(i915, aux_ch);
> +
> + if (drm_WARN_ON(&i915->drm, !domains) || domains->aux_io == POWER_DOMAIN_INVALID)
> + return POWER_DOMAIN_AUX_IO_A;a
The POWER_DOMAIN_INVALID things is for TC ports I guess? Shouldn't
this return the full AUX domain for the specific port for those?
Not that you should ever have eDP on them I suppose, so given
what you had in that earlier function I guess this should never
happen.
> +
> + return domains->aux_io + (int)(aux_ch - domains->aux_ch_start);
> +}
> +
> enum intel_display_power_domain
> intel_display_power_legacy_aux_domain(struct drm_i915_private *i915, enum aux_ch aux_ch)
> {
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
> index fd68d43bfe322..54737e0aec21e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> @@ -78,6 +78,11 @@ enum intel_display_power_domain {
> POWER_DOMAIN_AUDIO_PLAYBACK,
>
> POWER_DOMAIN_AUX_IO_A,
> + POWER_DOMAIN_AUX_IO_B,
> + POWER_DOMAIN_AUX_IO_C,
> + POWER_DOMAIN_AUX_IO_D,
> + POWER_DOMAIN_AUX_IO_E,
> + POWER_DOMAIN_AUX_IO_F,
>
> POWER_DOMAIN_AUX_A,
> POWER_DOMAIN_AUX_B,
> @@ -250,6 +255,8 @@ intel_display_power_ddi_lanes_domain(struct drm_i915_private *i915, enum port po
> enum intel_display_power_domain
> intel_display_power_ddi_io_domain(struct drm_i915_private *i915, enum port port);
> enum intel_display_power_domain
> +intel_display_power_aux_io_domain(struct drm_i915_private *i915, enum aux_ch aux_ch);
> +enum intel_display_power_domain
> intel_display_power_legacy_aux_domain(struct drm_i915_private *i915, enum aux_ch aux_ch);
> enum intel_display_power_domain
> intel_display_power_tbt_aux_domain(struct drm_i915_private *i915, enum aux_ch aux_ch);
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power_map.c b/drivers/gpu/drm/i915/display/intel_display_power_map.c
> index 43454022e6a66..b82c0d0a80c5f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_map.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_map.c
> @@ -170,6 +170,8 @@ I915_DECL_PW_DOMAINS(vlv_pwdoms_display,
> POWER_DOMAIN_VGA,
> POWER_DOMAIN_AUDIO_MMIO,
> POWER_DOMAIN_AUDIO_PLAYBACK,
> + POWER_DOMAIN_AUX_IO_B,
> + POWER_DOMAIN_AUX_IO_C,
> POWER_DOMAIN_AUX_B,
> POWER_DOMAIN_AUX_C,
> POWER_DOMAIN_GMBUS,
> @@ -179,6 +181,8 @@ I915_DECL_PW_DOMAINS(vlv_pwdoms_dpio_cmn_bc,
> POWER_DOMAIN_PORT_DDI_LANES_B,
> POWER_DOMAIN_PORT_DDI_LANES_C,
> POWER_DOMAIN_PORT_CRT,
> + POWER_DOMAIN_AUX_IO_B,
> + POWER_DOMAIN_AUX_IO_C,
> POWER_DOMAIN_AUX_B,
> POWER_DOMAIN_AUX_C,
> POWER_DOMAIN_INIT);
> @@ -186,6 +190,8 @@ I915_DECL_PW_DOMAINS(vlv_pwdoms_dpio_cmn_bc,
> I915_DECL_PW_DOMAINS(vlv_pwdoms_dpio_tx_bc_lanes,
> POWER_DOMAIN_PORT_DDI_LANES_B,
> POWER_DOMAIN_PORT_DDI_LANES_C,
> + POWER_DOMAIN_AUX_IO_B,
> + POWER_DOMAIN_AUX_IO_C,
> POWER_DOMAIN_AUX_B,
> POWER_DOMAIN_AUX_C,
> POWER_DOMAIN_INIT);
> @@ -243,6 +249,9 @@ I915_DECL_PW_DOMAINS(chv_pwdoms_display,
> POWER_DOMAIN_VGA,
> POWER_DOMAIN_AUDIO_MMIO,
> POWER_DOMAIN_AUDIO_PLAYBACK,
> + POWER_DOMAIN_AUX_IO_B,
> + POWER_DOMAIN_AUX_IO_C,
> + POWER_DOMAIN_AUX_IO_D,
> POWER_DOMAIN_AUX_B,
> POWER_DOMAIN_AUX_C,
> POWER_DOMAIN_AUX_D,
> @@ -252,12 +261,15 @@ I915_DECL_PW_DOMAINS(chv_pwdoms_display,
> I915_DECL_PW_DOMAINS(chv_pwdoms_dpio_cmn_bc,
> POWER_DOMAIN_PORT_DDI_LANES_B,
> POWER_DOMAIN_PORT_DDI_LANES_C,
> + POWER_DOMAIN_AUX_IO_B,
> + POWER_DOMAIN_AUX_IO_C,
> POWER_DOMAIN_AUX_B,
> POWER_DOMAIN_AUX_C,
> POWER_DOMAIN_INIT);
>
> I915_DECL_PW_DOMAINS(chv_pwdoms_dpio_cmn_d,
> POWER_DOMAIN_PORT_DDI_LANES_D,
> + POWER_DOMAIN_AUX_IO_D,
> POWER_DOMAIN_AUX_D,
> POWER_DOMAIN_INIT);
>
> @@ -305,6 +317,9 @@ static const struct i915_power_well_desc_list chv_power_wells[] = {
> POWER_DOMAIN_VGA, \
> POWER_DOMAIN_AUDIO_MMIO, \
> POWER_DOMAIN_AUDIO_PLAYBACK, \
> + POWER_DOMAIN_AUX_IO_B, \
> + POWER_DOMAIN_AUX_IO_C, \
> + POWER_DOMAIN_AUX_IO_D, \
> POWER_DOMAIN_AUX_B, \
> POWER_DOMAIN_AUX_C, \
> POWER_DOMAIN_AUX_D
> @@ -407,6 +422,8 @@ static const struct i915_power_well_desc_list skl_power_wells[] = {
> POWER_DOMAIN_VGA, \
> POWER_DOMAIN_AUDIO_MMIO, \
> POWER_DOMAIN_AUDIO_PLAYBACK, \
> + POWER_DOMAIN_AUX_IO_B, \
> + POWER_DOMAIN_AUX_IO_C, \
> POWER_DOMAIN_AUX_B, \
> POWER_DOMAIN_AUX_C
>
> @@ -430,6 +447,8 @@ I915_DECL_PW_DOMAINS(bxt_pwdoms_dpio_cmn_a,
> I915_DECL_PW_DOMAINS(bxt_pwdoms_dpio_cmn_bc,
> POWER_DOMAIN_PORT_DDI_LANES_B,
> POWER_DOMAIN_PORT_DDI_LANES_C,
> + POWER_DOMAIN_AUX_IO_B,
> + POWER_DOMAIN_AUX_IO_C,
> POWER_DOMAIN_AUX_B,
> POWER_DOMAIN_AUX_C,
> POWER_DOMAIN_INIT);
> @@ -483,6 +502,8 @@ static const struct i915_power_well_desc_list bxt_power_wells[] = {
> POWER_DOMAIN_VGA, \
> POWER_DOMAIN_AUDIO_MMIO, \
> POWER_DOMAIN_AUDIO_PLAYBACK, \
> + POWER_DOMAIN_AUX_IO_B, \
> + POWER_DOMAIN_AUX_IO_C, \
> POWER_DOMAIN_AUX_B, \
> POWER_DOMAIN_AUX_C
>
> @@ -509,11 +530,13 @@ I915_DECL_PW_DOMAINS(glk_pwdoms_dpio_cmn_a,
>
> I915_DECL_PW_DOMAINS(glk_pwdoms_dpio_cmn_b,
> POWER_DOMAIN_PORT_DDI_LANES_B,
> + POWER_DOMAIN_AUX_IO_B,
> POWER_DOMAIN_AUX_B,
> POWER_DOMAIN_INIT);
>
> I915_DECL_PW_DOMAINS(glk_pwdoms_dpio_cmn_c,
> POWER_DOMAIN_PORT_DDI_LANES_C,
> + POWER_DOMAIN_AUX_IO_C,
> POWER_DOMAIN_AUX_C,
> POWER_DOMAIN_INIT);
>
> @@ -523,10 +546,12 @@ I915_DECL_PW_DOMAINS(glk_pwdoms_aux_a,
> POWER_DOMAIN_INIT);
>
> I915_DECL_PW_DOMAINS(glk_pwdoms_aux_b,
> + POWER_DOMAIN_AUX_IO_B,
> POWER_DOMAIN_AUX_B,
> POWER_DOMAIN_INIT);
>
> I915_DECL_PW_DOMAINS(glk_pwdoms_aux_c,
> + POWER_DOMAIN_AUX_IO_C,
> POWER_DOMAIN_AUX_C,
> POWER_DOMAIN_INIT);
>
> @@ -617,6 +642,11 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_pw_4,
> POWER_DOMAIN_VGA, \
> POWER_DOMAIN_AUDIO_MMIO, \
> POWER_DOMAIN_AUDIO_PLAYBACK, \
> + POWER_DOMAIN_AUX_IO_B, \
> + POWER_DOMAIN_AUX_IO_C, \
> + POWER_DOMAIN_AUX_IO_D, \
> + POWER_DOMAIN_AUX_IO_E, \
> + POWER_DOMAIN_AUX_IO_F, \
> POWER_DOMAIN_AUX_B, \
> POWER_DOMAIN_AUX_C, \
> POWER_DOMAIN_AUX_D, \
> @@ -660,11 +690,21 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_ddi_io_f, POWER_DOMAIN_PORT_DDI_IO_F);
> I915_DECL_PW_DOMAINS(icl_pwdoms_aux_a,
> POWER_DOMAIN_AUX_IO_A,
> POWER_DOMAIN_AUX_A);
> -I915_DECL_PW_DOMAINS(icl_pwdoms_aux_b, POWER_DOMAIN_AUX_B);
> -I915_DECL_PW_DOMAINS(icl_pwdoms_aux_c, POWER_DOMAIN_AUX_C);
> -I915_DECL_PW_DOMAINS(icl_pwdoms_aux_d, POWER_DOMAIN_AUX_D);
> -I915_DECL_PW_DOMAINS(icl_pwdoms_aux_e, POWER_DOMAIN_AUX_E);
> -I915_DECL_PW_DOMAINS(icl_pwdoms_aux_f, POWER_DOMAIN_AUX_F);
> +I915_DECL_PW_DOMAINS(icl_pwdoms_aux_b,
> + POWER_DOMAIN_AUX_IO_B,
> + POWER_DOMAIN_AUX_B);
> +I915_DECL_PW_DOMAINS(icl_pwdoms_aux_c,
> + POWER_DOMAIN_AUX_IO_C,
> + POWER_DOMAIN_AUX_C);
> +I915_DECL_PW_DOMAINS(icl_pwdoms_aux_d,
> + POWER_DOMAIN_AUX_IO_D,
> + POWER_DOMAIN_AUX_D);
> +I915_DECL_PW_DOMAINS(icl_pwdoms_aux_e,
> + POWER_DOMAIN_AUX_IO_E,
> + POWER_DOMAIN_AUX_E);
> +I915_DECL_PW_DOMAINS(icl_pwdoms_aux_f,
> + POWER_DOMAIN_AUX_IO_F,
> + POWER_DOMAIN_AUX_F);
> I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt1, POWER_DOMAIN_AUX_TBT1);
> I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt2, POWER_DOMAIN_AUX_TBT2);
> I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt3, POWER_DOMAIN_AUX_TBT3);
> @@ -1215,6 +1255,9 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a,
> POWER_DOMAIN_PORT_DDI_LANES_TC4, \
> POWER_DOMAIN_VGA, \
> POWER_DOMAIN_AUDIO_PLAYBACK, \
> + POWER_DOMAIN_AUX_IO_C, \
> + POWER_DOMAIN_AUX_IO_D, \
> + POWER_DOMAIN_AUX_IO_E, \
> POWER_DOMAIN_AUX_C, \
> POWER_DOMAIN_AUX_D, \
> POWER_DOMAIN_AUX_E, \
> --
> 2.37.1
--
Ville Syrjälä
Intel
