drm/i915/tgl: TBT AUX should use TC power well ops
Subsystems (3)
PATCH 1/2 drm/i915/tgl: TBT AUX should use TC power well ops
As on ICL, we want to use the Type-C aux handlers for the TBT aux wells to ensure the DP_AUX_CH_CTL_TBT_IO flag is set properly.
--- drivers/gpu/drm/i915/display/intel_display_power.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +6 -6
@@ -4147,7 +4147,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TBT1", .domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4158,7 +4158,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TBT2", .domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4169,7 +4169,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TBT3", .domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4180,7 +4180,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TBT4", .domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4191,7 +4191,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TBT5", .domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4202,7 +4202,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TBT6", .domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Use single set of AUX powerwell ops for gen11+
AUX power wells sometimes need additional handling besides just programming the specific power well registers:
* Type-C PHY's also require additional Type-C register programming
* ICL combo PHY's require additional workarounds
* TGL & EHL combo PHY's can be treated like any other power well
Today we have dedicated aux ops for the ICL combo PHY and Type-C cases. This works fine, but means that when a new platform shows up with identical general power well handling, but different types of PHYs on its outputs, we have to define an entire new power well table for that platform and can't just re-use the table from the earlier platform -- as an example, see ehl_power_wells[], which is a subset of icl_power_wells[], *except* that we need to specify different AUX ops for the third display.
If we instead create a single set of top-level aux ops that will check the PHY type and then dispatch to the appropriate handlers, we can get more reuse out of our power well definitions. This allows us to immediately eliminate ehl_power_wells[] and simply reuse the ICL table; if future platforms follow the same general power well assignments as either ICL or TGL, we'll be able to re-use those tables in the same way.
Note that I've only changed ICL+ platforms over to using the new icl_aux ops; at this point it's unlikely that we'll have any new platforms that re-use gen9 or earlier power well configurations.
v2:
- ICL_AUX_PW_TO_PHY() won't return the proper PHY for TBT AUX power wells. But we know those wells will only used on Type-C outputs anyway, so we can just check is is_tc_tbt flag in the condition. (Jose).
--- .../drm/i915/display/intel_display_power.c | 244 +++++------------- 1 file changed, 62 insertions(+), 182 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +62 -182
@@ -593,6 +593,40 @@ icl_tc_phy_aux_power_well_disable(struct drm_i915_private *dev_priv,hsw_power_well_disable (dev_priv, power_well); } +static void +icl_aux_power_well_enable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +int pw_idx = power_well->desc->hsw.idx; +enum phy phy =ICL_AUX_PW_TO_PHY (pw_idx);/* non-TBT only */ +bool is_tbt = power_well->desc->hsw.is_tc_tbt; + +if (is_tbt ||intel_phy_is_tc (dev_priv, phy)) +return icl_tc_phy_aux_power_well_enable (dev_priv, power_well); +else if (IS_ICELAKE (dev_priv)) +return icl_combo_phy_aux_power_well_enable (dev_priv, + power_well); +else +return hsw_power_well_enable (dev_priv, power_well); +} + +static void +icl_aux_power_well_disable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +int pw_idx = power_well->desc->hsw.idx; +enum phy phy =ICL_AUX_PW_TO_PHY (pw_idx);/* non-TBT only */ +bool is_tbt = power_well->desc->hsw.is_tc_tbt; + +if (is_tbt ||intel_phy_is_tc (dev_priv, phy)) +return icl_tc_phy_aux_power_well_disable (dev_priv, power_well); +else if (IS_ICELAKE (dev_priv)) +return icl_combo_phy_aux_power_well_disable (dev_priv, + power_well); +else +return hsw_power_well_disable (dev_priv, power_well); +} +/* * We should only use the power well if we explicitly asked the hardware to * enable it, so check if it's enabled and also check if we've requested it to
@@ -3503,17 +3537,10 @@ static const struct i915_power_well_desc cnl_power_wells[] = { }, }; -static const struct i915_power_well_ops icl_combo_phy_aux_power_well_ops = { - .sync_hw = hsw_power_well_sync_hw, - .enable = icl_combo_phy_aux_power_well_enable, - .disable = icl_combo_phy_aux_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; - -static const struct i915_power_well_ops icl_tc_phy_aux_power_well_ops = { +static const struct i915_power_well_ops icl_aux_power_well_ops = { .sync_hw = hsw_power_well_sync_hw, - .enable = icl_tc_phy_aux_power_well_enable, - .disable = icl_tc_phy_aux_power_well_disable, + .enable = icl_aux_power_well_enable, + .disable = icl_aux_power_well_disable, .is_enabled = hsw_power_well_enabled, };
@@ -3643,7 +3670,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX A", .domains = ICL_AUX_A_IO_POWER_DOMAINS, - .ops = &icl_combo_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3653,7 +3680,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX B", .domains = ICL_AUX_B_IO_POWER_DOMAINS, - .ops = &icl_combo_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3663,7 +3690,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX C TC1", .domains = ICL_AUX_C_TC1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3674,7 +3701,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX D TC2", .domains = ICL_AUX_D_TC2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3685,7 +3712,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX E TC3", .domains = ICL_AUX_E_TC3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3696,7 +3723,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX F TC4", .domains = ICL_AUX_F_TC4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3707,7 +3734,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX C TBT1", .domains = ICL_AUX_C_TBT1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3718,7 +3745,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX D TBT2", .domains = ICL_AUX_D_TBT2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3729,7 +3756,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX E TBT3", .domains = ICL_AUX_E_TBT3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3740,7 +3767,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX F TBT4", .domains = ICL_AUX_F_TBT4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -3762,151 +3789,6 @@ static const struct i915_power_well_desc icl_power_wells[] = { }, }; -static const struct i915_power_well_desc ehl_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 =ICL_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 2" , - .domains =ICL_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 =ICL_PW_3_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_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 C IO" , - .domains =ICL_DDI_IO_C_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_C , - }, - }, - { - .name ="DDI D IO" , - .domains =ICL_DDI_IO_D_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_D , - }, - }, - { - .name ="AUX A" , - .domains =ICL_AUX_A_IO_POWER_DOMAINS , - .ops = &hsw_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 =ICL_AUX_B_IO_POWER_DOMAINS , - .ops = &hsw_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 C" , - .domains =ICL_AUX_C_TC1_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.regs = &icl_aux_power_well_regs, - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - }, - }, - { - .name ="AUX D" , - .domains =ICL_AUX_D_TC2_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.regs = &icl_aux_power_well_regs, - .hsw.idx =ICL_PW_CTL_IDX_AUX_D , - }, - }, - { - .name ="power well 4" , - .domains =ICL_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 ), - }, - }, -}; -static const struct i915_power_well_desc tgl_power_wells[] = { { .name ="always-on" ,
@@ -4051,7 +3933,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX A", .domains = TGL_AUX_A_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4061,7 +3943,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX B", .domains = TGL_AUX_B_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4071,7 +3953,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX C", .domains = TGL_AUX_C_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4081,7 +3963,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TC1", .domains = TGL_AUX_D_TC1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4092,7 +3974,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TC2", .domains = TGL_AUX_E_TC2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4103,7 +3985,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TC3", .domains = TGL_AUX_F_TC3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4114,7 +3996,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TC4", .domains = TGL_AUX_G_TC4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4125,7 +4007,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TC5", .domains = TGL_AUX_H_TC5_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4136,7 +4018,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TC6", .domains = TGL_AUX_I_TC6_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4147,7 +4029,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TBT1", .domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4158,7 +4040,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TBT2", .domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4169,7 +4051,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TBT3", .domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4180,7 +4062,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TBT4", .domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4191,7 +4073,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TBT5", .domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4202,7 +4084,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TBT6", .domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs,
@@ -4383,8 +4265,6 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)*/ if (IS_GEN (dev_priv,12 )) { err =set_power_wells (power_domains, tgl_power_wells); - }else if (IS_ELKHARTLAKE (dev_priv)) { - err =set_power_wells (power_domains, ehl_power_wells); }else if (IS_GEN (dev_priv,11 )) { err =set_power_wells (power_domains, icl_power_wells); }else if (IS_CANNONLAKE (dev_priv)) {
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 2/2] drm/i915: Use single set of AUX powerwell ops for gen11+
Quoted 35 lines · Matt Roper
AUX power wells sometimes need additional handling besides just programming the specific power well registers:
* Type-C PHY's also require additional Type-C register programming
* ICL combo PHY's require additional workarounds
* TGL & EHL combo PHY's can be treated like any other power wellToday we have dedicated aux ops for the ICL combo PHY and Type-C cases.
This works fine, but means that when a new platform shows up with identical general power well handling, but different types of PHYs on its outputs, we have to define an entire new power well table for that
platform and can't just re-use the table from the earlier platform -- as
an example, see ehl_power_wells[], which is a subset of icl_power_wells[], *except* that we need to specify different AUX ops for the third display.If we instead create a single set of top-level aux ops that will check
the PHY type and then dispatch to the appropriate handlers, we can get
more reuse out of our power well definitions. This allows us to immediately eliminate ehl_power_wells[] and simply reuse the ICL table;
if future platforms follow the same general power well assignments as either ICL or TGL, we'll be able to re-use those tables in the same way.Note that I've only changed ICL+ platforms over to using the new
icl_aux
ops; at this point it's unlikely that we'll have any new platforms that
re-use gen9 or earlier power well configurations.
Quoted 6 lines
v2:
-ICL_AUX_PW_TO_PHY()won't return the proper PHY for TBT AUX power wells. But we know those wells will only used on Type-C outputs anyway, so we can just check isis_tc_tbtflag in the condition. (Jose).
Quoted 495 lines
Cc José Roberto de Souza <[email protected]>Signed-off-by Matt Roper <[email protected]>--- .../drm/i915/display/intel_display_power.c | 244 +++++----------- -- 1 file changed, 62 insertions(+), 182 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +30
-0@@ -593,6 +593,40 @@ icl_tc_phy_aux_power_well_disable(structdrm_i915_private *dev_priv,hsw_power_well_disable (dev_priv ,power_well ); } +static void +icl_aux_power_well_enable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +int pw_idx = power_well->desc->hsw.idx; +enum phy phy =ICL_AUX_PW_TO_PHY (pw_idx);/* non-TBT only */ +bool is_tbt = power_well->desc->hsw.is_tc_tbt; + +if (is_tbt ||intel_phy_is_tc (dev_priv, phy)) +return icl_tc_phy_aux_power_well_enable (dev_priv, power_well); +else if (IS_ICELAKE (dev_priv)) +return icl_combo_phy_aux_power_well_enable (dev_priv, + power_well); +else +return hsw_power_well_enable (dev_priv, power_well); +} + +static void +icl_aux_power_well_disable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +int pw_idx = power_well->desc->hsw.idx; +enum phy phy =ICL_AUX_PW_TO_PHY (pw_idx);/* non-TBT only */ +bool is_tbt = power_well->desc->hsw.is_tc_tbt; + +if (is_tbt ||intel_phy_is_tc (dev_priv, phy)) +return icl_tc_phy_aux_power_well_disable (dev_priv, power_well); +else if (IS_ICELAKE (dev_priv)) +return icl_combo_phy_aux_power_well_disable (dev_priv, + power_well);
drivers/gpu/drm/i915/display/intel_display_power.c +4
-0+else +return hsw_power_well_disable (dev_priv, power_well); +} +/* * We should only use the power well if we explicitly asked the hardware to
* enable it, so check if it's enabled and also check if we've
requested it todrivers/gpu/drm/i915/display/intel_display_power.c +3
-10@@ -3503,17 +3537,10 @@ static const struct i915_power_well_desc cnl_power_wells[] = { }, }; -static const struct i915_power_well_ops icl_combo_phy_aux_power_well_ops = { - .sync_hw = hsw_power_well_sync_hw, - .enable = icl_combo_phy_aux_power_well_enable, - .disable = icl_combo_phy_aux_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; - -static const struct i915_power_well_ops icl_tc_phy_aux_power_well_ops = { +static const struct i915_power_well_ops icl_aux_power_well_ops = { .sync_hw = hsw_power_well_sync_hw, - .enable = icl_tc_phy_aux_power_well_enable, - .disable = icl_tc_phy_aux_power_well_disable, + .enable = icl_aux_power_well_enable, + .disable = icl_aux_power_well_disable,drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.is_enabled = hsw_power_well_enabled, };@@ -3643,7 +3670,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX A", .domains = ICL_AUX_A_IO_POWER_DOMAINS, - .ops = &icl_combo_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3653,7 +3680,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX B", .domains = ICL_AUX_B_IO_POWER_DOMAINS, - .ops = &icl_combo_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3663,7 +3690,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX C TC1", .domains = ICL_AUX_C_TC1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3674,7 +3701,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX D TC2", .domains = ICL_AUX_D_TC2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3685,7 +3712,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX E TC3", .domains = ICL_AUX_E_TC3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3696,7 +3723,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX F TC4", .domains = ICL_AUX_F_TC4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3707,7 +3734,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX C TBT1", .domains = ICL_AUX_C_TBT1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3718,7 +3745,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX D TBT2", .domains = ICL_AUX_D_TBT2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3729,7 +3756,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX E TBT3", .domains = ICL_AUX_E_TBT3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3740,7 +3767,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX F TBT4", .domains = ICL_AUX_F_TBT4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +0
-145.hsw.regs = &icl_aux_power_well_regs,@@ -3762,151 +3789,6 @@ static const struct i915_power_well_desc icl_power_wells[] = { }, }; -static const struct i915_power_well_desc ehl_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 =ICL_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 2" , - .domains =ICL_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 =ICL_PW_3_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_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 C IO" , - .domains =ICL_DDI_IO_C_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_C , - }, - }, - { - .name ="DDI D IO" , - .domains =ICL_DDI_IO_D_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_D , - }, - }, - { - .name ="AUX A" , - .domains =ICL_AUX_A_IO_POWER_DOMAINS , - .ops = &hsw_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 =ICL_AUX_B_IO_POWER_DOMAINS , - .ops = &hsw_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 C" , - .domains =ICL_AUX_C_TC1_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.regs = &icl_aux_power_well_regs, - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - }, - }, - { - .name ="AUX D" , - .domains =ICL_AUX_D_TC2_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.regs = &icl_aux_power_well_regs, - .hsw.idx =ICL_PW_CTL_IDX_AUX_D , - }, - }, - { - .name ="power well 4" , - .domains =ICL_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 ), - }, - }, -}; -static const struct i915_power_well_desc tgl_power_wells[] = { {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.name = "always-on",@@ -4051,7 +3933,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX A", .domains = TGL_AUX_A_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4061,7 +3943,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX B", .domains = TGL_AUX_B_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4071,7 +3953,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX C", .domains = TGL_AUX_C_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4081,7 +3963,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TC1", .domains = TGL_AUX_D_TC1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4092,7 +3974,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TC2", .domains = TGL_AUX_E_TC2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4103,7 +3985,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TC3", .domains = TGL_AUX_F_TC3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4114,7 +3996,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TC4", .domains = TGL_AUX_G_TC4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4125,7 +4007,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TC5", .domains = TGL_AUX_H_TC5_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4136,7 +4018,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TC6", .domains = TGL_AUX_I_TC6_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4147,7 +4029,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TBT1", .domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4158,7 +4040,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TBT2", .domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4169,7 +4051,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TBT3", .domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4180,7 +4062,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TBT4", .domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4191,7 +4073,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TBT5", .domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4202,7 +4084,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TBT6", .domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +0
-2.hsw.regs = &icl_aux_power_well_regs,@@ -4383,8 +4265,6 @@ int intel_power_domains_init(structdrm_i915_private *dev_priv) */ if (IS_GEN (dev_priv,12 )) { err =set_power_wells (power_domains, tgl_power_wells); - }else if (IS_ELKHARTLAKE (dev_priv)) { - err =set_power_wells (power_domains, ehl_power_wells); }else if (IS_GEN (dev_priv,11 )) { err =set_power_wells (power_domains, icl_power_wells);
Quoted 1 line
} else if (
IS_CANNONLAKE(dev_priv)) {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Matt Roper
AppliedRe: [Intel-gfx] [PATCH 2/2] drm/i915: Use single set of AUX powerwell ops for gen11+
Quoted 36 lines · Jose
Quoted 35 lines · Matt Roper
AUX power wells sometimes need additional handling besides just programming the specific power well registers:
* Type-C PHY's also require additional Type-C register programming
* ICL combo PHY's require additional workarounds
* TGL & EHL combo PHY's can be treated like any other power wellToday we have dedicated aux ops for the ICL combo PHY and Type-C cases.
This works fine, but means that when a new platform shows up with identical general power well handling, but different types of PHYs on its outputs, we have to define an entire new power well table for that
platform and can't just re-use the table from the earlier platform -- as
an example, see ehl_power_wells[], which is a subset of icl_power_wells[], *except* that we need to specify different AUX ops for the third display.If we instead create a single set of top-level aux ops that will check
the PHY type and then dispatch to the appropriate handlers, we can get
more reuse out of our power well definitions. This allows us to immediately eliminate ehl_power_wells[] and simply reuse the ICL table;
if future platforms follow the same general power well assignments as either ICL or TGL, we'll be able to re-use those tables in the same way.Note that I've only changed ICL+ platforms over to using the new
icl_aux
ops; at this point it's unlikely that we'll have any new platforms that
re-use gen9 or earlier power well configurations.
Quoted 8 lines
Quoted 6 lines
v2:
-ICL_AUX_PW_TO_PHY()won't return the proper PHY for TBT AUX power wells. But we know those wells will only used on Type-C outputs anyway, so we can just check isis_tc_tbtflag in the condition. (Jose).Reviewed-by José Roberto de Souza <[email protected]>
Applied to dinq. Thanks for the review.
Matt
Quoted 497 lines
Quoted 497 lines
Cc José Roberto de Souza <[email protected]>Signed-off-by Matt Roper <[email protected]>--- .../drm/i915/display/intel_display_power.c | 244 +++++----------- -- 1 file changed, 62 insertions(+), 182 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +30
-0@@ -593,6 +593,40 @@ icl_tc_phy_aux_power_well_disable(structdrm_i915_private *dev_priv,hsw_power_well_disable (dev_priv ,power_well ); } +static void +icl_aux_power_well_enable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +int pw_idx = power_well->desc->hsw.idx; +enum phy phy =ICL_AUX_PW_TO_PHY (pw_idx);/* non-TBT only */ +bool is_tbt = power_well->desc->hsw.is_tc_tbt; + +if (is_tbt ||intel_phy_is_tc (dev_priv, phy)) +return icl_tc_phy_aux_power_well_enable (dev_priv, power_well); +else if (IS_ICELAKE (dev_priv)) +return icl_combo_phy_aux_power_well_enable (dev_priv, + power_well); +else +return hsw_power_well_enable (dev_priv, power_well); +} + +static void +icl_aux_power_well_disable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +int pw_idx = power_well->desc->hsw.idx; +enum phy phy =ICL_AUX_PW_TO_PHY (pw_idx);/* non-TBT only */ +bool is_tbt = power_well->desc->hsw.is_tc_tbt; + +if (is_tbt ||intel_phy_is_tc (dev_priv, phy)) +return icl_tc_phy_aux_power_well_disable (dev_priv, power_well); +else if (IS_ICELAKE (dev_priv)) +return icl_combo_phy_aux_power_well_disable (dev_priv, + power_well);
drivers/gpu/drm/i915/display/intel_display_power.c +4
-0+else +return hsw_power_well_disable (dev_priv, power_well); +} +/* * We should only use the power well if we explicitly asked the hardware to
* enable it, so check if it's enabled and also check if we've
requested it todrivers/gpu/drm/i915/display/intel_display_power.c +3
-10@@ -3503,17 +3537,10 @@ static const struct i915_power_well_desc cnl_power_wells[] = { }, }; -static const struct i915_power_well_ops icl_combo_phy_aux_power_well_ops = { - .sync_hw = hsw_power_well_sync_hw, - .enable = icl_combo_phy_aux_power_well_enable, - .disable = icl_combo_phy_aux_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; - -static const struct i915_power_well_ops icl_tc_phy_aux_power_well_ops = { +static const struct i915_power_well_ops icl_aux_power_well_ops = { .sync_hw = hsw_power_well_sync_hw, - .enable = icl_tc_phy_aux_power_well_enable, - .disable = icl_tc_phy_aux_power_well_disable, + .enable = icl_aux_power_well_enable, + .disable = icl_aux_power_well_disable,drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.is_enabled = hsw_power_well_enabled, };@@ -3643,7 +3670,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX A", .domains = ICL_AUX_A_IO_POWER_DOMAINS, - .ops = &icl_combo_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3653,7 +3680,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX B", .domains = ICL_AUX_B_IO_POWER_DOMAINS, - .ops = &icl_combo_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3663,7 +3690,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX C TC1", .domains = ICL_AUX_C_TC1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3674,7 +3701,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX D TC2", .domains = ICL_AUX_D_TC2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3685,7 +3712,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX E TC3", .domains = ICL_AUX_E_TC3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3696,7 +3723,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX F TC4", .domains = ICL_AUX_F_TC4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3707,7 +3734,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX C TBT1", .domains = ICL_AUX_C_TBT1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3718,7 +3745,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX D TBT2", .domains = ICL_AUX_D_TBT2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3729,7 +3756,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX E TBT3", .domains = ICL_AUX_E_TBT3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -3740,7 +3767,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { { .name = "AUX F TBT4", .domains = ICL_AUX_F_TBT4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +0
-145.hsw.regs = &icl_aux_power_well_regs,@@ -3762,151 +3789,6 @@ static const struct i915_power_well_desc icl_power_wells[] = { }, }; -static const struct i915_power_well_desc ehl_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 =ICL_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 2" , - .domains =ICL_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 =ICL_PW_3_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_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 C IO" , - .domains =ICL_DDI_IO_C_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_C , - }, - }, - { - .name ="DDI D IO" , - .domains =ICL_DDI_IO_D_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_D , - }, - }, - { - .name ="AUX A" , - .domains =ICL_AUX_A_IO_POWER_DOMAINS , - .ops = &hsw_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 =ICL_AUX_B_IO_POWER_DOMAINS , - .ops = &hsw_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 C" , - .domains =ICL_AUX_C_TC1_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.regs = &icl_aux_power_well_regs, - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - }, - }, - { - .name ="AUX D" , - .domains =ICL_AUX_D_TC2_IO_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.regs = &icl_aux_power_well_regs, - .hsw.idx =ICL_PW_CTL_IDX_AUX_D , - }, - }, - { - .name ="power well 4" , - .domains =ICL_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 ), - }, - }, -}; -static const struct i915_power_well_desc tgl_power_wells[] = { {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.name = "always-on",@@ -4051,7 +3933,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX A", .domains = TGL_AUX_A_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4061,7 +3943,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX B", .domains = TGL_AUX_B_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4071,7 +3953,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX C", .domains = TGL_AUX_C_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4081,7 +3963,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TC1", .domains = TGL_AUX_D_TC1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4092,7 +3974,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TC2", .domains = TGL_AUX_E_TC2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4103,7 +3985,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TC3", .domains = TGL_AUX_F_TC3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4114,7 +3996,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TC4", .domains = TGL_AUX_G_TC4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4125,7 +4007,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TC5", .domains = TGL_AUX_H_TC5_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4136,7 +4018,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TC6", .domains = TGL_AUX_I_TC6_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4147,7 +4029,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TBT1", .domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4158,7 +4040,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TBT2", .domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4169,7 +4051,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TBT3", .domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4180,7 +4062,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TBT4", .domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4191,7 +4073,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TBT5", .domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4202,7 +4084,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TBT6", .domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS, - .ops = &icl_tc_phy_aux_power_well_ops, + .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +0
-2.hsw.regs = &icl_aux_power_well_regs,@@ -4383,8 +4265,6 @@ int intel_power_domains_init(structdrm_i915_private *dev_priv) */ if (IS_GEN (dev_priv,12 )) { err =set_power_wells (power_domains, tgl_power_wells); - }else if (IS_ELKHARTLAKE (dev_priv)) { - err =set_power_wells (power_domains, ehl_power_wells); }else if (IS_GEN (dev_priv,11 )) { err =set_power_wells (power_domains, icl_power_wells);} else if (
IS_CANNONLAKE(dev_priv)) {
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines · Matt Roper
As on ICL, we want to use the Type-C aux handlers for the TBT aux wells
to ensure theDP_AUX_CH_CTL_TBT_IOflag is set properly.
Quoted 73 lines
Fixes 656409bbaf87 ("drm/i915/tgl: Add power well support")Cc José Roberto de Souza <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_power.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +1
-1@@ -4147,7 +4147,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TBT1", .domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4158,7 +4158,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TBT2", .domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4169,7 +4169,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TBT3", .domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4180,7 +4180,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TBT4", .domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4191,7 +4191,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TBT5", .domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4202,7 +4202,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TBT6", .domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {
Quoted 1 line
.hsw.regs =
&icl_aux_power_well_regs,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Jose
Quoted 3 lines · Matt Roper
As on ICL, we want to use the Type-C aux handlers for the TBT aux wells
to ensure theDP_AUX_CH_CTL_TBT_IOflag is set properly.Reviewed-by José Roberto de Souza <[email protected]>
Thanks. CI came back clean, so I went ahead and pushed patch #1 of the series.
Matt
Quoted 75 lines
Quoted 75 lines
Fixes 656409bbaf87 ("drm/i915/tgl: Add power well support")Cc José Roberto de Souza <[email protected]>Cc Imre Deak <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_power.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +1
-1@@ -4147,7 +4147,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX D TBT1", .domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4158,7 +4158,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX E TBT2", .domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4169,7 +4169,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX F TBT3", .domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4180,7 +4180,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX G TBT4", .domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4191,7 +4191,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX H TBT5", .domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {drivers/gpu/drm/i915/display/intel_display_power.c +1
-1.hsw.regs = &icl_aux_power_well_regs,@@ -4202,7 +4202,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { { .name = "AUX I TBT6", .domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS, - .ops = &hsw_power_well_ops, + .ops = &icl_tc_phy_aux_power_well_ops, .id = DISP_PW_ID_NONE, {.hsw.regs =
&icl_aux_power_well_regs,
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.DOCS: warning for series starting with [1/2] drm/i915/tgl: TBT AUX should use TC power well ops
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/tgl: TBT AUX should use TC power well ops
URL : https://patchwork.freedesktop.org/series/75998/
State : warning
== Summary ==
$ make htmldocs 2>&1 > /dev/null | grep i915 /home/cidrm/kernel/Documentation/gpu/i915.rst:610: WARNING: duplicate label gpu/i915:layout, other instance in /home/cidrm/kernel/Documentation/gpu/i915.rst
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/tgl: TBT AUX should use TC power well ops
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/tgl: TBT AUX should use TC power well ops
URL : https://patchwork.freedesktop.org/series/75998/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8305 -> Patchwork_17319
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/index.html
Known issues
------------
Here are the changes found in Patchwork_17319 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
- fi-skl-6770hq: [PASS][1] -> [SKIP][2] ([fdo#109271]) +20 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/fi-skl-6770hq/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/fi-skl-6770hq/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [SKIP][3] ([fdo#109271]) -> [FAIL][4] ([i915#62])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/fi-kbl-x1275/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/fi-kbl-x1275/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
Participating hosts (51 -> 45)
------------------------------
Missing (6): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8305 -> Patchwork_17319
CI-20190529: 20190529
CI_DRM_8305: 6f16366a3061bc52af7a7ab423b08cc8cb8bf039 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5591: f57b7fdbe8d04ce3edf0433a03c7d9d5c3d96680 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17319: 6e0eb59bceddb6427bad5934c8664b8c19f3765c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
6e0eb59bcedd drm/i915: Use single set of AUX powerwell ops for gen11+ 91ebcb9b39b9 drm/i915/tgl: TBT AUX should use TC power well ops
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/2] drm/i915/tgl: TBT AUX should use TC power well ops
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915/tgl: TBT AUX should use TC power well ops
URL : https://patchwork.freedesktop.org/series/75998/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8305_full -> Patchwork_17319_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_17319_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@kms_flip@plain-flip-ts-check@a-edp1}:
- shard-skl: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-skl1/igt@kms_flip@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-skl3/igt@kms_flip@[email protected]
Known issues
------------
Here are the changes found in Patchwork_17319_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- shard-kbl: [PASS][3] -> [DMESG-WARN][4] ([i915#180]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-kbl6/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-kbl2/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x42-sliding:
- shard-apl: [PASS][5] -> [FAIL][6] ([i915#54] / [i915#95])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-apl4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-apl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([i915#300])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-skl3/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-skl9/igt@[email protected]
* igt@kms_psr@psr2_primary_blt:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109441]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-iclb2/igt@kms_psr@psr2_primary_blt.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-iclb4/igt@kms_psr@psr2_primary_blt.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#180]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-apl8/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-apl2/igt@[email protected]
#### Possible fixes ####
* igt@i915_pm_dc@dc6-dpms:
- shard-iclb: [FAIL][13] ([i915#454]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-iclb1/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-iclb1/igt@[email protected]
* igt@kms_atomic_transition@plane-all-modeset-transition-fencing:
- shard-snb: [SKIP][15] ([fdo#109271]) -> [PASS][16] +3 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-snb6/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-snb1/igt@[email protected]
* igt@kms_color@pipe-a-degamma:
- shard-skl: [FAIL][17] ([fdo#108145] / [i915#71]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-skl10/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-skl5/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-64x21-onscreen:
- shard-apl: [FAIL][19] ([i915#54] / [i915#95]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-apl8/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-apl4/igt@[email protected]
* igt@kms_cursor_legacy@pipe-b-torture-bo:
- shard-snb: [DMESG-WARN][21] ([i915#128]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-snb2/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-snb5/igt@[email protected]
* {igt@kms_flip@flip-vs-suspend-interruptible@a-dp1}:
- shard-kbl: [INCOMPLETE][23] ([i915#155]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-kbl3/igt@kms_flip@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-kbl7/igt@kms_flip@[email protected]
* {igt@kms_flip@flip-vs-suspend-interruptible@c-dp1}:
- shard-apl: [DMESG-WARN][25] ([i915#180]) -> [PASS][26] +3 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-apl1/igt@kms_flip@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-apl8/igt@kms_flip@[email protected]
* {igt@kms_flip@flip-vs-suspend@c-dp1}:
- shard-kbl: [DMESG-WARN][27] ([i915#180]) -> [PASS][28] +6 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-kbl4/igt@kms_flip@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-kbl7/igt@kms_flip@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][29] ([fdo#108145] / [i915#265]) -> [PASS][30] +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-skl9/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-skl7/igt@[email protected]
* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [SKIP][31] ([fdo#109441]) -> [PASS][32] +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-iclb7/igt@kms_psr@psr2_sprite_mmap_gtt.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
* {igt@perf@polling-parameterized}:
- shard-hsw: [FAIL][33] ([i915#1542]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-hsw1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-hsw4/igt@[email protected]
* {igt@sysfs_heartbeat_interval@mixed@vcs0}:
- shard-skl: [INCOMPLETE][35] ([i915#198]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-skl2/igt@sysfs_heartbeat_interval@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-skl10/igt@sysfs_heartbeat_interval@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc6-psr:
- shard-tglb: [FAIL][37] ([i915#454]) -> [SKIP][38] ([i915#468])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-tglb1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-tglb2/igt@[email protected]
* igt@i915_pm_rpm@fences:
- shard-snb: [INCOMPLETE][39] ([i915#82]) -> [SKIP][40] ([fdo#109271]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-snb6/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-snb6/igt@[email protected]
* igt@i915_pm_rpm@gem-idle:
- shard-snb: [SKIP][41] ([fdo#109271]) -> [INCOMPLETE][42] ([i915#82])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8305/shard-snb1/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/shard-snb1/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#128]: https://gitlab.freedesktop.org/drm/intel/issues/128
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#71]: https://gitlab.freedesktop.org/drm/intel/issues/71
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8305 -> Patchwork_17319
CI-20190529: 20190529
CI_DRM_8305: 6f16366a3061bc52af7a7ab423b08cc8cb8bf039 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5591: f57b7fdbe8d04ce3edf0433a03c7d9d5c3d96680 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17319: 6e0eb59bceddb6427bad5934c8664b8c19f3765c @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17319/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx