On Wed, Jul 28, 2021 at 04:59:26PM +0300, Gupta, Anshuman wrote:
> 
> 
> > -----Original Message-----
> > From: Deak, Imre <imre.d...@intel.com>
> > Sent: Wednesday, July 28, 2021 7:02 PM
> > To: Gupta, Anshuman <anshuman.gu...@intel.com>
> > Cc: intel-gfx@lists.freedesktop.org; Ville Syrjälä 
> > <ville.syrj...@linux.intel.com>;
> > Kai Vehmanen <kai.vehma...@linux.intel.com>; Shankar, Uma
> > <uma.shan...@intel.com>
> > Subject: Re: [PATCH 1/3] drm/i915/dg1: Adjust the AUDIO power domain
> > 
> > On Wed, Jul 28, 2021 at 05:22:16PM +0530, Anshuman Gupta wrote:
> > > DG1 and XE_PLD platforms has Audio MMIO/VERBS lies in PG0 power well.
> > > Adjusting the power domain accordingly to POWER_DOMAIN_AUDIO_VERBS
> > for
> > > audio detection and POWER_DOMAIN_AUDIO for audio playback.
> > >
> > > v1: Changes since RFC
> > > - changed power domain names. [Imre]
> > > - Removed TC{3,6}, AUX_USBC{3,6} and TBT from DG1
> > >   power well and PW_3 power domains. [Imre]
> > > - Fixed the order of powe wells , power domains and its
> > >   registration. [Imre]
> > >
> > > v2:
> > > - Not allowe DC states when AUDIO_MMIO domain enabled. [Imre]
> > >
> > > Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
> > > Cc: Kai Vehmanen <kai.vehma...@linux.intel.com>
> > > Cc: Uma Shankar <uma.shan...@intel.com>
> > > Cc: Imre Deak <imre.d...@intel.com>
> > > Signed-off-by: Anshuman Gupta <anshuman.gu...@intel.com>
> > 
> > On the patchset:
> > Reviewed-by: Imre Deak <imre.d...@intel.com>
> Thanks Imre for providing RB. 
> Does RB on patchset means RB for all three patches in the series?

Yes, patchset = series of 3 patches.

> Br,
> Anshuman Gupta.
>  
> > 
> > > ---
> > >  .../drm/i915/display/intel_display_power.c    | 234 ++++++++++++++++--
> > >  .../drm/i915/display/intel_display_power.h    |   3 +-
> > >  2 files changed, 221 insertions(+), 16 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c
> > > b/drivers/gpu/drm/i915/display/intel_display_power.c
> > > index 81efc77bada0..2675b48d707e 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> > > @@ -106,8 +106,10 @@ intel_display_power_domain_str(enum
> > intel_display_power_domain domain)
> > >           return "PORT_OTHER";
> > >   case POWER_DOMAIN_VGA:
> > >           return "VGA";
> > > - case POWER_DOMAIN_AUDIO:
> > > -         return "AUDIO";
> > > + case POWER_DOMAIN_AUDIO_MMIO:
> > > +         return "AUDIO_MMIO";
> > > + case POWER_DOMAIN_AUDIO_PLAYBACK:
> > > +         return "AUDIO_PLAYBAK";
> > >   case POWER_DOMAIN_AUX_A:
> > >           return "AUX_A";
> > >   case POWER_DOMAIN_AUX_B:
> > > @@ -2519,7 +2521,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_PORT_DSI) |                \
> > >   BIT_ULL(POWER_DOMAIN_PORT_CRT) |                \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                     \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |           \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |          \
> > >   BIT_ULL(POWER_DOMAIN_AUX_B) |           \
> > >   BIT_ULL(POWER_DOMAIN_AUX_C) |           \
> > >   BIT_ULL(POWER_DOMAIN_GMBUS) |           \
> > > @@ -2569,7 +2572,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) |        \
> > >   BIT_ULL(POWER_DOMAIN_PORT_DSI) |                \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                     \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |           \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |          \
> > >   BIT_ULL(POWER_DOMAIN_AUX_B) |           \
> > >   BIT_ULL(POWER_DOMAIN_AUX_C) |           \
> > >   BIT_ULL(POWER_DOMAIN_AUX_D) |           \
> > > @@ -2602,7 +2606,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) |                \
> > >   BIT_ULL(POWER_DOMAIN_PORT_CRT) | /* DDI E */    \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                             \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >
> > >  #define BDW_DISPLAY_POWER_DOMAINS (                      \
> > > @@ -2618,7 +2623,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) |                \
> > >   BIT_ULL(POWER_DOMAIN_PORT_CRT) | /* DDI E */    \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                             \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >
> > >  #define SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS (          \
> > > @@ -2636,7 +2642,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_AUX_B) |                       \
> > >   BIT_ULL(POWER_DOMAIN_AUX_C) |                   \
> > >   BIT_ULL(POWER_DOMAIN_AUX_D) |                   \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                             \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >  #define SKL_DISPLAY_DDI_IO_A_E_POWER_DOMAINS (           \
> > > @@ -2671,7 +2678,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) |                \
> > >   BIT_ULL(POWER_DOMAIN_AUX_B) |                   \
> > >   BIT_ULL(POWER_DOMAIN_AUX_C) |                   \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                             \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >  #define BXT_DISPLAY_DC_OFF_POWER_DOMAINS (               \
> > > @@ -2704,7 +2712,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) |                \
> > >   BIT_ULL(POWER_DOMAIN_AUX_B) |                       \
> > >   BIT_ULL(POWER_DOMAIN_AUX_C) |                   \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                             \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >  #define GLK_DISPLAY_DDI_IO_A_POWER_DOMAINS (             \
> > > @@ -2759,7 +2768,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_AUX_C) |                   \
> > >   BIT_ULL(POWER_DOMAIN_AUX_D) |                   \
> > >   BIT_ULL(POWER_DOMAIN_AUX_F) |                   \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                             \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >  #define CNL_DISPLAY_DDI_A_IO_POWER_DOMAINS (             \
> > > @@ -2841,7 +2851,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_AUX_E_TBT) |               \
> > >   BIT_ULL(POWER_DOMAIN_AUX_F_TBT) |               \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                     \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >   /*
> > >    * - transcoder WD
> > > @@ -2933,7 +2944,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_AUX_TBT5) |                \
> > >   BIT_ULL(POWER_DOMAIN_AUX_TBT6) |                \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                     \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >
> > >  #define TGL_PW_2_POWER_DOMAINS (                 \
> > > @@ -3003,7 +3015,8 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   RKL_PW_4_POWER_DOMAINS |                        \
> > >   BIT_ULL(POWER_DOMAIN_PIPE_B) |                  \
> > >   BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) |     \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                     \
> > >   BIT_ULL(POWER_DOMAIN_TRANSCODER_B) |            \
> > >   BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC1) |      \
> > > @@ -3040,6 +3053,35 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   BIT_ULL(POWER_DOMAIN_AUX_B) |                   \
> > >   BIT_ULL(POWER_DOMAIN_INIT))
> > >
> > > +/*
> > > + * DG1 onwards Audio MMIO/VERBS lies in PG0 power well.
> > > + */
> > > +#define DG1_PW_3_POWER_DOMAINS (                 \
> > > + TGL_PW_4_POWER_DOMAINS |                        \
> > > + BIT_ULL(POWER_DOMAIN_PIPE_B) |                  \
> > > + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) |            \
> > > + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) |     \
> > > + BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC1) |      \
> > > + BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC2) |      \
> > > + BIT_ULL(POWER_DOMAIN_AUX_USBC1) |               \
> > > + BIT_ULL(POWER_DOMAIN_AUX_USBC2) |               \
> > > + BIT_ULL(POWER_DOMAIN_VGA) |                     \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > > + BIT_ULL(POWER_DOMAIN_INIT))
> > > +
> > > +#define DG1_PW_2_POWER_DOMAINS (                 \
> > > + DG1_PW_3_POWER_DOMAINS |                        \
> > > + BIT_ULL(POWER_DOMAIN_TRANSCODER_VDSC_PW2) |     \
> > > + BIT_ULL(POWER_DOMAIN_INIT))
> > > +
> > > +#define DG1_DISPLAY_DC_OFF_POWER_DOMAINS (               \
> > > + DG1_PW_3_POWER_DOMAINS |                        \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > > + BIT_ULL(POWER_DOMAIN_MODESET) |                 \
> > > + BIT_ULL(POWER_DOMAIN_AUX_A) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUX_B) |                   \
> > > + BIT_ULL(POWER_DOMAIN_INIT))
> > > +
> > >  /*
> > >   * XE_LPD Power Domains
> > >   *
> > > @@ -3085,7 +3127,7 @@ intel_display_power_put_mask_in_set(struct
> > drm_i915_private *i915,
> > >   XELPD_PW_B_POWER_DOMAINS |                      \
> > >   XELPD_PW_C_POWER_DOMAINS |                      \
> > >   XELPD_PW_D_POWER_DOMAINS |                      \
> > > - BIT_ULL(POWER_DOMAIN_AUDIO) |                   \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) |                  \
> > >   BIT_ULL(POWER_DOMAIN_VGA) |                     \
> > >   BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) |        \
> > >   BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_D_XELPD) |  \
> > > @@ -3126,6 +3168,7 @@ intel_display_power_put_mask_in_set(struct
> > > drm_i915_private *i915,
> > >
> > >  #define XELPD_DISPLAY_DC_OFF_POWER_DOMAINS (             \
> > >   XELPD_PW_2_POWER_DOMAINS |                      \
> > > + BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) |              \
> > >   BIT_ULL(POWER_DOMAIN_MODESET) |                 \
> > >   BIT_ULL(POWER_DOMAIN_AUX_A) |                   \
> > >   BIT_ULL(POWER_DOMAIN_AUX_B) |                   \
> > > @@ -4654,6 +4697,165 @@ static const struct i915_power_well_desc
> > rkl_power_wells[] = {
> > >   },
> > >  };
> > >
> > > +static const struct i915_power_well_desc dg1_power_wells[] = {
> > > + {
> > > +         .name = "always-on",
> > > +         .always_on = true,
> > > +         .domains = POWER_DOMAIN_MASK,
> > > +         .ops = &i9xx_always_on_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > + },
> > > + {
> > > +         .name = "power well 1",
> > > +         /* Handled by the DMC firmware */
> > > +         .always_on = true,
> > > +         .domains = 0,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = SKL_DISP_PW_1,
> > > +         {
> > > +                 .hsw.regs = &hsw_power_well_regs,
> > > +                 .hsw.idx = ICL_PW_CTL_IDX_PW_1,
> > > +                 .hsw.has_fuses = true,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "DC off",
> > > +         .domains = DG1_DISPLAY_DC_OFF_POWER_DOMAINS,
> > > +         .ops = &gen9_dc_off_power_well_ops,
> > > +         .id = SKL_DISP_DC_OFF,
> > > + },
> > > + {
> > > +         .name = "power well 2",
> > > +         .domains = DG1_PW_2_POWER_DOMAINS,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = SKL_DISP_PW_2,
> > > +         {
> > > +                 .hsw.regs = &hsw_power_well_regs,
> > > +                 .hsw.idx = ICL_PW_CTL_IDX_PW_2,
> > > +                 .hsw.has_fuses = true,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "power well 3",
> > > +         .domains = DG1_PW_3_POWER_DOMAINS,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = ICL_DISP_PW_3,
> > > +         {
> > > +                 .hsw.regs = &hsw_power_well_regs,
> > > +                 .hsw.idx = ICL_PW_CTL_IDX_PW_3,
> > > +                 .hsw.irq_pipe_mask = BIT(PIPE_B),
> > > +                 .hsw.has_vga = true,
> > > +                 .hsw.has_fuses = true,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "DDI A IO",
> > > +         .domains = ICL_DDI_IO_A_POWER_DOMAINS,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &icl_ddi_power_well_regs,
> > > +                 .hsw.idx = ICL_PW_CTL_IDX_DDI_A,
> > > +         }
> > > + },
> > > + {
> > > +         .name = "DDI B IO",
> > > +         .domains = ICL_DDI_IO_B_POWER_DOMAINS,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &icl_ddi_power_well_regs,
> > > +                 .hsw.idx = ICL_PW_CTL_IDX_DDI_B,
> > > +         }
> > > + },
> > > + {
> > > +         .name = "DDI IO TC1",
> > > +         .domains = TGL_DDI_IO_TC1_POWER_DOMAINS,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &icl_ddi_power_well_regs,
> > > +                 .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "DDI IO TC2",
> > > +         .domains = TGL_DDI_IO_TC2_POWER_DOMAINS,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &icl_ddi_power_well_regs,
> > > +                 .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "AUX A",
> > > +         .domains = TGL_AUX_A_IO_POWER_DOMAINS,
> > > +         .ops = &icl_aux_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &icl_aux_power_well_regs,
> > > +                 .hsw.idx = ICL_PW_CTL_IDX_AUX_A,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "AUX B",
> > > +         .domains = TGL_AUX_B_IO_POWER_DOMAINS,
> > > +         .ops = &icl_aux_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &icl_aux_power_well_regs,
> > > +                 .hsw.idx = ICL_PW_CTL_IDX_AUX_B,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "AUX USBC1",
> > > +         .domains = TGL_AUX_IO_USBC1_POWER_DOMAINS,
> > > +         .ops = &icl_aux_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &icl_aux_power_well_regs,
> > > +                 .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1,
> > > +                 .hsw.is_tc_tbt = false,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "AUX USBC2",
> > > +         .domains = TGL_AUX_IO_USBC2_POWER_DOMAINS,
> > > +         .ops = &icl_aux_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &icl_aux_power_well_regs,
> > > +                 .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2,
> > > +                 .hsw.is_tc_tbt = false,
> > > +         },
> > > + },
> > > + {
> > > +         .name = "power well 4",
> > > +         .domains = TGL_PW_4_POWER_DOMAINS,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &hsw_power_well_regs,
> > > +                 .hsw.idx = ICL_PW_CTL_IDX_PW_4,
> > > +                 .hsw.has_fuses = true,
> > > +                 .hsw.irq_pipe_mask = BIT(PIPE_C),
> > > +         }
> > > + },
> > > + {
> > > +         .name = "power well 5",
> > > +         .domains = TGL_PW_5_POWER_DOMAINS,
> > > +         .ops = &hsw_power_well_ops,
> > > +         .id = DISP_PW_ID_NONE,
> > > +         {
> > > +                 .hsw.regs = &hsw_power_well_regs,
> > > +                 .hsw.idx = TGL_PW_CTL_IDX_PW_5,
> > > +                 .hsw.has_fuses = true,
> > > +                 .hsw.irq_pipe_mask = BIT(PIPE_D),
> > > +         },
> > > + },
> > > +};
> > > +
> > >  static const struct i915_power_well_desc xelpd_power_wells[] = {
> > >   {
> > >           .name = "always-on",
> > > @@ -5138,7 +5340,9 @@ int intel_power_domains_init(struct
> > drm_i915_private *dev_priv)
> > >           err = 0;
> > >   } else if (DISPLAY_VER(dev_priv) >= 13) {
> > >           err = set_power_wells(power_domains, xelpd_power_wells);
> > > - } else if (IS_ALDERLAKE_S(dev_priv) || IS_DG1(dev_priv)) {
> > > + } else if (IS_DG1(dev_priv)) {
> > > +         err = set_power_wells(power_domains, dg1_power_wells);
> > > + } else if (IS_ALDERLAKE_S(dev_priv)) {
> > >           err = set_power_wells_mask(power_domains, tgl_power_wells,
> > >
> > BIT_ULL(TGL_DISP_PW_TC_COLD_OFF));
> > >   } else if (IS_ROCKETLAKE(dev_priv)) { diff --git
> > > a/drivers/gpu/drm/i915/display/intel_display_power.h
> > > b/drivers/gpu/drm/i915/display/intel_display_power.h
> > > index ad788bbd727d..521072be412c 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display_power.h
> > > +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
> > > @@ -76,7 +76,8 @@ enum intel_display_power_domain {
> > >   POWER_DOMAIN_PORT_CRT,
> > >   POWER_DOMAIN_PORT_OTHER,
> > >   POWER_DOMAIN_VGA,
> > > - POWER_DOMAIN_AUDIO,
> > > + POWER_DOMAIN_AUDIO_MMIO,
> > > + POWER_DOMAIN_AUDIO_PLAYBACK,
> > >   POWER_DOMAIN_AUX_A,
> > >   POWER_DOMAIN_AUX_B,
> > >   POWER_DOMAIN_AUX_C,
> > > --
> > > 2.26.2
> > >
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to