drm/i915: Refactor the display power domain mappings
Subsystems (3)
v3 cover drm/i915: Refactor the display power domain mappings
This is v3 of the second half of [1], rebased on drm-tip (containing the first half [2]), addressing the review comments from Jouni and with a minor documentation/rename change in patch 3.
[1] https://patchwork.freedesktop.org/series/99476/
[2] https://patchwork.freedesktop.org/series/100591/
Imre Deak (18):
drm/i915: Move per-platform power well hooks to intel_display_power_well.c drm/i915: Unexport the for_each_power_well() macros
drm/i915: Move the power domain->well mappings to intel_display_power_map.c drm/i915: Move the dg2 fixed_enable_delay power well param to a common bitfield drm/i915: Move the HSW power well flags to a common bitfield drm/i915: Rename the power domain names to end with pipes/ports drm/i915: Sanitize the power well names
drm/i915: Convert the power well descriptor domain mask to an array of domains drm/i915: Convert the u64 power well domains mask to a bitmap drm/i915: Simplify power well definitions by adding power well instances drm/i915: Allow platforms to share power well descriptors drm/i915: Simplify the DG1 power well descriptors
drm/i915: Sanitize the ADL-S power well definition
drm/i915: Sanitize the port -> DDI/AUX power domain mapping for each platform drm/i915: Remove the aliasing of power domain enum values drm/i915: Remove the ICL specific TBT power domains
drm/i915: Remove duplicate DDI/AUX power domain mappings
drm/i915: Remove the XELPD specific AUX and DDI power domains
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/g4x_dp.c | 3 +- drivers/gpu/drm/i915/display/g4x_hdmi.c | 3 +- drivers/gpu/drm/i915/display/icl_dsi.c | 8 +- drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- drivers/gpu/drm/i915/display/intel_display.c | 150 +- drivers/gpu/drm/i915/display/intel_display.h | 4 +- .../drm/i915/display/intel_display_power.c | 4477 ++--------------- .../drm/i915/display/intel_display_power.h | 122 +- .../i915/display/intel_display_power_map.c | 1501 ++++++ .../i915/display/intel_display_power_map.h | 14 + .../i915/display/intel_display_power_well.c | 1838 ++++++- .../i915/display/intel_display_power_well.h | 132 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 + drivers/gpu/drm/i915/display/intel_pps.c | 1 + drivers/gpu/drm/i915/display/intel_tc.c | 5 +- 16 files changed, 3881 insertions(+), 4385 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.h
Signature · 1 line
2.30.2
PATCH v3 1/18 drm/i915: Move per-platform power well hooks to intel_display_power_well.c
Move the implementation of platform specific power well hooks to intel_display_power_well.c, to reduce the clutter in intel_display_power.c.
The locking of all the power domain/power well state is handled in the power domain functions in intel_display_power.c using i915_power_domains::lock. This patch also moves the chy_phy_powergate_ch/lanes() functions to intel_display_power_well.c which borrow the same lock to protect the DISPLAY_PHY_CONTROL register state, which the HW uses both for toggling power wells and power gating PHY lanes.
No functional change.
v2:
- Clarify in the commit log why CHV functions using the i915_power_domains::lock were moved, while others locking the power domain/well state were kept in intel_display_power.c . (Jouni)
- Move forward declaration of chv_phy_powergate_ch/lanes() to intel_display_power_well.h .
--- .../drm/i915/display/intel_display_power.c | 1759 ---------------- .../drm/i915/display/intel_display_power.h | 5 - .../i915/display/intel_display_power_well.c | 1817 +++++++++++++++++ .../i915/display/intel_display_power_well.h | 62 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 + drivers/gpu/drm/i915/display/intel_pps.c | 1 + 6 files changed, 1846 insertions(+), 1799 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +0 -1759
@@ -9,24 +9,16 @@#include "i915_irq.h" #include "intel_cdclk.h" #include "intel_combo_phy.h" -#include "intel_combo_phy_regs.h" -#include "intel_crt.h" #include "intel_de.h" #include "intel_display_power.h" #include "intel_display_power_well.h" #include "intel_display_types.h" #include "intel_dmc.h" -#include "intel_dpio_phy.h" -#include "intel_dpll.h" -#include "intel_hotplug.h" #include "intel_mchbar_regs.h" #include "intel_pch_refclk.h" #include "intel_pcode.h" #include "intel_pm.h" -#include "intel_pps.h" #include "intel_snps_phy.h" -#include "intel_tc.h" -#include "intel_vga.h" #include "vlv_sideband.h" const char *
@@ -235,604 +227,6 @@ bool intel_display_power_is_enabled(struct drm_i915_private *dev_priv,return ret; } -/* -* Starting with Haswell, we have a "Power Down Well" that can be turned off -* when not needed anymore. We have 4 registers that can request the power well -* to be enabled, and it will only be disabled if none of the registers is -* requesting it to be enabled. -*/ -static void hsw_power_well_post_enable (struct drm_i915_private *dev_priv, -u8 irq_pipe_mask,bool has_vga) -{ -if (has_vga) -intel_vga_reset_io_mem (dev_priv); - -if (irq_pipe_mask) -gen8_irq_power_well_post_enable (dev_priv, irq_pipe_mask); -} - -static void hsw_power_well_pre_disable (struct drm_i915_private *dev_priv, -u8 irq_pipe_mask) -{ -if (irq_pipe_mask) -gen8_irq_power_well_pre_disable (dev_priv, irq_pipe_mask); -} - -#define ICL_AUX_PW_TO_CH (pw_idx) \ - ((pw_idx) - ICL_PW_CTL_IDX_AUX_A + AUX_CH_A) - -#define ICL_TBT_AUX_PW_TO_CH (pw_idx) \ - ((pw_idx) - ICL_PW_CTL_IDX_AUX_TBT1 + AUX_CH_C) - -static enum aux_ch icl_aux_pw_to_ch (const struct i915_power_well *power_well) -{ -int pw_idx = power_well->desc->hsw.idx; - -return power_well->desc->hsw.is_tc_tbt ?ICL_TBT_AUX_PW_TO_CH (pw_idx) : -ICL_AUX_PW_TO_CH (pw_idx); -} - -static struct intel_digital_port * -aux_ch_to_digital_port (struct drm_i915_private *dev_priv, -enum aux_ch aux_ch) -{ -struct intel_digital_port *dig_port =NULL ; -struct intel_encoder *encoder; - -for_each_intel_encoder (&dev_priv->drm, encoder) { -/* We'll check the MST primary port */ -if (encoder->type ==INTEL_OUTPUT_DP_MST ) -continue ; - - dig_port =enc_to_dig_port (encoder); -if (!dig_port) -continue ; - -if (dig_port->aux_ch != aux_ch) { - dig_port =NULL ; -continue ; - } - -break ; - } - -return dig_port; -} - -static enum phy icl_aux_pw_to_phy (struct drm_i915_private *i915, -const struct i915_power_well *power_well) -{ -enum aux_ch aux_ch =icl_aux_pw_to_ch (power_well); -struct intel_digital_port *dig_port =aux_ch_to_digital_port (i915, aux_ch); - -return intel_port_to_phy (i915, dig_port->base.port); -} - -static void hsw_wait_for_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well, -bool timeout_expected) -{ -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -int pw_idx = power_well->desc->hsw.idx; -int enable_delay = power_well->desc->hsw.fixed_enable_delay; - -/* -* For some power wells we're not supposed to watch the status bit for -* an ack, but rather just wait a fixed amount of time and then -* proceed. This is only used on DG2. -*/ -if (IS_DG2 (dev_priv) && enable_delay) { -usleep_range (enable_delay,2 * enable_delay); -return ; - } - -/* Timeout for PW1:10 us, AUX:not specified, other PWs:20 us. */ -if (intel_de_wait_for_set (dev_priv, regs->driver, -HSW_PWR_WELL_CTL_STATE (pw_idx),1 )) { -drm_dbg_kms (&dev_priv->drm,"%s power well enable timeout\n" , -intel_power_well_name (power_well)); - -drm_WARN_ON (&dev_priv->drm, !timeout_expected); - - } -} - -static u32 hsw_power_well_requesters (struct drm_i915_private *dev_priv, -const struct i915_power_well_regs *regs, -int pw_idx) -{ -u32 req_mask =HSW_PWR_WELL_CTL_REQ (pw_idx); -u32 ret; - - ret =intel_de_read (dev_priv, regs->bios) & req_mask ?1 :0 ; - ret |=intel_de_read (dev_priv, regs->driver) & req_mask ?2 :0 ; -if (regs->kvmr.reg) - ret |=intel_de_read (dev_priv, regs->kvmr) & req_mask ?4 :0 ; - ret |=intel_de_read (dev_priv, regs->debug) & req_mask ?8 :0 ; - -return ret; -} - -static void hsw_wait_for_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -int pw_idx = power_well->desc->hsw.idx; -bool disabled; -u32 reqs; - -/* -* Bspec doesn't require waiting for PWs to get disabled, but still do -* this for paranoia. The known cases where a PW will be forced on: -* - a KVMR request on any power well via the KVMR request register -* - a DMC request on PW1 and MISC_IO power wells via the BIOS and -* DEBUG request registers -* Skip the wait in case any of the request bits are set and print a -* diagnostic message. -*/ -wait_for ((disabled = !(intel_de_read (dev_priv, regs->driver) & -HSW_PWR_WELL_CTL_STATE (pw_idx))) || - (reqs =hsw_power_well_requesters (dev_priv, regs, pw_idx)),1 ); -if (disabled) -return ; - -drm_dbg_kms (&dev_priv->drm, -"%s forced on (bios:%d driver:%d kvmr:%d debug:%d)\n" , -intel_power_well_name (power_well), - !!(reqs &1 ), !!(reqs &2 ), !!(reqs &4 ), !!(reqs &8 )); -} - -static void gen9_wait_for_power_well_fuses (struct drm_i915_private *dev_priv, -enum skl_power_gate pg) -{ -/* Timeout 5us for PG#0, for other PGs 1us */ -drm_WARN_ON (&dev_priv->drm, -intel_de_wait_for_set (dev_priv,SKL_FUSE_STATUS , -SKL_FUSE_PG_DIST_STATUS (pg),1 )); -} - -static void hsw_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -int pw_idx = power_well->desc->hsw.idx; -u32 val; - -if (power_well->desc->hsw.has_fuses) { -enum skl_power_gate pg; - - pg =DISPLAY_VER (dev_priv) >=11 ?ICL_PW_CTL_IDX_TO_PG (pw_idx) : -SKL_PW_CTL_IDX_TO_PG (pw_idx); - -/* Wa_16013190616:adlp */ -if (IS_ALDERLAKE_P (dev_priv) && pg ==SKL_PG1 ) -intel_de_rmw (dev_priv,GEN8_CHICKEN_DCPR_1 ,0 ,DISABLE_FLR_SRC ); - -/* -* For PW1 we have to wait both for the PW0/PG0 fuse state -* before enabling the power well and PW1/PG1's own fuse -* state after the enabling. For all other power wells with -* fuses we only have to wait for that PW/PG's fuse state -* after the enabling. -*/ -if (pg ==SKL_PG1 ) -gen9_wait_for_power_well_fuses (dev_priv,SKL_PG0 ); - } - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val |HSW_PWR_WELL_CTL_REQ (pw_idx)); - -hsw_wait_for_power_well_enable (dev_priv, power_well, false); - -if (power_well->desc->hsw.has_fuses) { -enum skl_power_gate pg; - - pg =DISPLAY_VER (dev_priv) >=11 ?ICL_PW_CTL_IDX_TO_PG (pw_idx) : -SKL_PW_CTL_IDX_TO_PG (pw_idx); -gen9_wait_for_power_well_fuses (dev_priv, pg); - } - -hsw_power_well_post_enable (dev_priv, - power_well->desc->hsw.irq_pipe_mask, - power_well->desc->hsw.has_vga); -} - -static void hsw_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -int pw_idx = power_well->desc->hsw.idx; -u32 val; - -hsw_power_well_pre_disable (dev_priv, - power_well->desc->hsw.irq_pipe_mask); - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val & ~HSW_PWR_WELL_CTL_REQ (pw_idx)); -hsw_wait_for_power_well_disable (dev_priv, power_well); -} - -static void -icl_combo_phy_aux_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -int pw_idx = power_well->desc->hsw.idx; -enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); -u32 val; - -drm_WARN_ON (&dev_priv->drm, !IS_ICELAKE (dev_priv)); - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val |HSW_PWR_WELL_CTL_REQ (pw_idx)); - -if (DISPLAY_VER (dev_priv) <12 ) { - val =intel_de_read (dev_priv,ICL_PORT_CL_DW12 (phy)); -intel_de_write (dev_priv,ICL_PORT_CL_DW12 (phy), - val |ICL_LANE_ENABLE_AUX ); - } - -hsw_wait_for_power_well_enable (dev_priv, power_well, false); - -/* Display WA #1178: icl */ -if (pw_idx >=ICL_PW_CTL_IDX_AUX_A && pw_idx <=ICL_PW_CTL_IDX_AUX_B && - !intel_bios_is_port_edp (dev_priv, (enum port )phy)) { - val =intel_de_read (dev_priv,ICL_AUX_ANAOVRD1 (pw_idx)); - val |=ICL_AUX_ANAOVRD1_ENABLE |ICL_AUX_ANAOVRD1_LDO_BYPASS ; -intel_de_write (dev_priv,ICL_AUX_ANAOVRD1 (pw_idx), val); - } -} - -static void -icl_combo_phy_aux_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -int pw_idx = power_well->desc->hsw.idx; -enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); -u32 val; - -drm_WARN_ON (&dev_priv->drm, !IS_ICELAKE (dev_priv)); - - val =intel_de_read (dev_priv,ICL_PORT_CL_DW12 (phy)); -intel_de_write (dev_priv,ICL_PORT_CL_DW12 (phy), - val & ~ICL_LANE_ENABLE_AUX ); - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val & ~HSW_PWR_WELL_CTL_REQ (pw_idx)); - -hsw_wait_for_power_well_disable (dev_priv, power_well); -} - -#if IS_ENABLED (CONFIG_DRM_I915_DEBUG_RUNTIME_PM ) - -static void icl_tc_port_assert_ref_held (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well, -struct intel_digital_port *dig_port) -{ -if (drm_WARN_ON (&dev_priv->drm, !dig_port)) -return ; - -if (DISPLAY_VER (dev_priv) ==11 &&intel_tc_cold_requires_aux_pw (dig_port)) -return ; - -drm_WARN_ON (&dev_priv->drm, !intel_tc_port_ref_held (dig_port)); -} - -#else - -static void icl_tc_port_assert_ref_held (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well, -struct intel_digital_port *dig_port) -{ -} - -#endif - -#define TGL_AUX_PW_TO_TC_PORT (pw_idx) ((pw_idx) - TGL_PW_CTL_IDX_AUX_TC1) - -static void icl_tc_cold_exit (struct drm_i915_private *i915) -{ -int ret, tries =0 ; - -while (1 ) { - ret =snb_pcode_write_timeout (i915,ICL_PCODE_EXIT_TCCOLD ,0 , -250 ,1 ); -if (ret != -EAGAIN || ++tries ==3 ) -break ; -msleep (1 ); - } - -/* Spec states that TC cold exit can take up to 1ms to complete */ -if (!ret) -msleep (1 ); - -/* TODO: turn failure into a error as soon i915 CI updates ICL IFWI */ -drm_dbg_kms (&i915->drm,"TC cold block %s\n" , ret ?"failed" : -"succeeded" ); -} - -static void -icl_tc_phy_aux_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -enum aux_ch aux_ch =icl_aux_pw_to_ch (power_well); -struct intel_digital_port *dig_port =aux_ch_to_digital_port (dev_priv, aux_ch); -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -bool is_tbt = power_well->desc->hsw.is_tc_tbt; -bool timeout_expected; -u32 val; - -icl_tc_port_assert_ref_held (dev_priv, power_well, dig_port); - - val =intel_de_read (dev_priv,DP_AUX_CH_CTL (aux_ch)); - val &= ~DP_AUX_CH_CTL_TBT_IO ; -if (is_tbt) - val |=DP_AUX_CH_CTL_TBT_IO ; -intel_de_write (dev_priv,DP_AUX_CH_CTL (aux_ch), val); - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val |HSW_PWR_WELL_CTL_REQ (power_well->desc->hsw.idx)); - -/* -* An AUX timeout is expected if the TBT DP tunnel is down, -* or need to enable AUX on a legacy TypeC port as part of the TC-cold -* exit sequence. -*/ - timeout_expected = is_tbt ||intel_tc_cold_requires_aux_pw (dig_port); -if (DISPLAY_VER (dev_priv) ==11 &&intel_tc_cold_requires_aux_pw (dig_port)) -icl_tc_cold_exit (dev_priv); - -hsw_wait_for_power_well_enable (dev_priv, power_well, timeout_expected); - -if (DISPLAY_VER (dev_priv) >=12 && !is_tbt) { -enum tc_port tc_port; - - tc_port =TGL_AUX_PW_TO_TC_PORT (power_well->desc->hsw.idx); -intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), -HIP_INDEX_VAL (tc_port,0x2 )); - -if (intel_de_wait_for_set (dev_priv,DKL_CMN_UC_DW_27 (tc_port), -DKL_CMN_UC_DW27_UC_HEALTH ,1 )) -drm_warn (&dev_priv->drm, -"Timeout waiting TC uC health\n" ); - } -} - -static void -icl_aux_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); - -if (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) -{ -enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); - -if (intel_phy_is_tc (dev_priv, phy)) -return hsw_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 -* be enabled. -*/ -static bool hsw_power_well_enabled (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -enum i915_power_well_id id = power_well->desc->id; -int pw_idx = power_well->desc->hsw.idx; -u32 mask =HSW_PWR_WELL_CTL_REQ (pw_idx) | -HSW_PWR_WELL_CTL_STATE (pw_idx); -u32 val; - - val =intel_de_read (dev_priv, regs->driver); - -/* -* On GEN9 big core due to a DMC bug the driver's request bits for PW1 -* and the MISC_IO PW will be not restored, so check instead for the -* BIOS's own request bits, which are forced-on for these power wells -* when exiting DC5/6. -*/ -if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv) && - (id ==SKL_DISP_PW_1 || id ==SKL_DISP_PW_MISC_IO )) - val |=intel_de_read (dev_priv, regs->bios); - -return (val & mask) == mask; -} - -static void assert_can_enable_dc9 (struct drm_i915_private *dev_priv) -{ -drm_WARN_ONCE (&dev_priv->drm, - (intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_DC9 ), -"DC9 already programmed to be enabled.\n" ); -drm_WARN_ONCE (&dev_priv->drm, -intel_de_read (dev_priv,DC_STATE_EN ) & -DC_STATE_EN_UPTO_DC5 , -"DC5 still not disabled to enable DC9.\n" ); -drm_WARN_ONCE (&dev_priv->drm, -intel_de_read (dev_priv,HSW_PWR_WELL_CTL2 ) & -HSW_PWR_WELL_CTL_REQ (SKL_PW_CTL_IDX_PW_2 ), -"Power well 2 on.\n" ); -drm_WARN_ONCE (&dev_priv->drm,intel_irqs_enabled (dev_priv), -"Interrupts not disabled yet.\n" ); - -/* -* TODO: check for the following to verify the conditions to enter DC9 -* state are satisfied: -* 1] Check relevant display engine registers to verify if mode set -* disable sequence was followed. -* 2] Check if display uninitialize sequence is initialized. -*/ -} - -static void assert_can_disable_dc9 (struct drm_i915_private *dev_priv) -{ -drm_WARN_ONCE (&dev_priv->drm,intel_irqs_enabled (dev_priv), -"Interrupts not disabled yet.\n" ); -drm_WARN_ONCE (&dev_priv->drm, -intel_de_read (dev_priv,DC_STATE_EN ) & -DC_STATE_EN_UPTO_DC5 , -"DC5 still not disabled.\n" ); - -/* -* TODO: check for the following to verify DC9 state was indeed -* entered before programming to disable it: -* 1] Check relevant display engine registers to verify if mode -* set disable sequence was followed. -* 2] Check if display uninitialize sequence is initialized. -*/ -} - -static void gen9_write_dc_state (struct drm_i915_private *dev_priv, -u32 state) -{ -int rewrites =0 ; -int rereads =0 ; -u32 v; - -intel_de_write (dev_priv,DC_STATE_EN , state); - -/* It has been observed that disabling the dc6 state sometimes -* doesn't stick and dmc keeps returning old value. Make sure -* the write really sticks enough times and also force rewrite until -* we are confident that state is exactly what we want. -*/ -do { - v =intel_de_read (dev_priv,DC_STATE_EN ); - -if (v != state) { -intel_de_write (dev_priv,DC_STATE_EN , state); - rewrites++; - rereads =0 ; - }else if (rereads++ >5 ) { -break ; - } - - }while (rewrites <100 ); - -if (v != state) -drm_err (&dev_priv->drm, -"Writing dc state to 0x%x failed, now 0x%x\n" , - state, v); - -/* Most of the times we need one retry, avoid spam */ -if (rewrites >1 ) -drm_dbg_kms (&dev_priv->drm, -"Rewrote dc state to 0x%x %d times\n" , - state, rewrites); -} - -static u32 gen9_dc_mask (struct drm_i915_private *dev_priv) -{ -u32 mask; - - mask =DC_STATE_EN_UPTO_DC5 ; - -if (DISPLAY_VER (dev_priv) >=12 ) - mask |=DC_STATE_EN_DC3CO |DC_STATE_EN_UPTO_DC6 - |DC_STATE_EN_DC9 ; -else if (DISPLAY_VER (dev_priv) ==11 ) - mask |=DC_STATE_EN_UPTO_DC6 |DC_STATE_EN_DC9 ; -else if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) - mask |=DC_STATE_EN_DC9 ; -else - mask |=DC_STATE_EN_UPTO_DC6 ; - -return mask; -} - -static void gen9_sanitize_dc_state (struct drm_i915_private *dev_priv) -{ -u32 val; - -if (!HAS_DISPLAY (dev_priv)) -return ; - - val =intel_de_read (dev_priv,DC_STATE_EN ) &gen9_dc_mask (dev_priv); - -drm_dbg_kms (&dev_priv->drm, -"Resetting DC state tracking from %02x to %02x\n" , - dev_priv->dmc.dc_state, val); - dev_priv->dmc.dc_state = val; -} - -/** -* gen9_set_dc_state - set target display C power state -* @dev_priv: i915 device instance -* @state: target DC power state -* - DC_STATE_DISABLE -* - DC_STATE_EN_UPTO_DC5 -* - DC_STATE_EN_UPTO_DC6 -* - DC_STATE_EN_DC9 -* -* Signal to DMC firmware/HW the target DC power state passed in @state. -* DMC/HW can turn off individual display clocks and power rails when entering -* a deeper DC power state (higher in number) and turns these back when exiting -* that state to a shallower power state (lower in number). The HW will decide -* when to actually enter a given state on an on-demand basis, for instance -* depending on the active state of display pipes. The state of display -* registers backed by affected power rails are saved/restored as needed. -* -* Based on the above enabling a deeper DC power state is asynchronous wrt. -* enabling it. Disabling a deeper power state is synchronous: for instance -* setting %DC_STATE_DISABLE won't complete until all HW resources are turned -* back on and register state is restored. This is guaranteed by the MMIO write -* to DC_STATE_EN blocking until the state is restored. -*/ -static void gen9_set_dc_state (struct drm_i915_private *dev_priv,u32 state) -{ -u32 val; -u32 mask; - -if (!HAS_DISPLAY (dev_priv)) -return ; - -if (drm_WARN_ON_ONCE (&dev_priv->drm, - state & ~dev_priv->dmc.allowed_dc_mask)) - state &= dev_priv->dmc.allowed_dc_mask; - - val =intel_de_read (dev_priv,DC_STATE_EN ); - mask =gen9_dc_mask (dev_priv); -drm_dbg_kms (&dev_priv->drm,"Setting DC state from %02x to %02x\n" , - val & mask, state); - -/* Check if DMC is ignoring our DC state requests */ -if ((val & mask) != dev_priv->dmc.dc_state) -drm_err (&dev_priv->drm,"DC state mismatch (0x%x -> 0x%x)\n" , - dev_priv->dmc.dc_state, val & mask); - - val &= ~mask; - val |= state; - -gen9_write_dc_state (dev_priv, val); - - dev_priv->dmc.dc_state = val & mask; -} -static u32 sanitize_target_dc_state (struct drm_i915_private *dev_priv,u32 target_dc_state)
@@ -858,65 +252,6 @@ sanitize_target_dc_state(struct drm_i915_private *dev_priv,return target_dc_state; } -static void tgl_enable_dc3co (struct drm_i915_private *dev_priv) -{ -drm_dbg_kms (&dev_priv->drm,"Enabling DC3CO\n" ); -gen9_set_dc_state (dev_priv,DC_STATE_EN_DC3CO ); -} - -static void tgl_disable_dc3co (struct drm_i915_private *dev_priv) -{ -u32 val; - -drm_dbg_kms (&dev_priv->drm,"Disabling DC3CO\n" ); - val =intel_de_read (dev_priv,DC_STATE_EN ); - val &= ~DC_STATE_DC3CO_STATUS ; -intel_de_write (dev_priv,DC_STATE_EN , val); -gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); -/* -* Delay of 200us DC3CO Exit time B.Spec 49196 -*/ -usleep_range (200 ,210 ); -} - -static void bxt_enable_dc9 (struct drm_i915_private *dev_priv) -{ -assert_can_enable_dc9 (dev_priv); - -drm_dbg_kms (&dev_priv->drm,"Enabling DC9\n" ); -/* -* Power sequencer reset is not needed on -* platforms with South Display Engine on PCH, -* because PPS registers are always on. -*/ -if (!HAS_PCH_SPLIT (dev_priv)) -intel_pps_reset_all (dev_priv); -gen9_set_dc_state (dev_priv,DC_STATE_EN_DC9 ); -} - -static void bxt_disable_dc9 (struct drm_i915_private *dev_priv) -{ -assert_can_disable_dc9 (dev_priv); - -drm_dbg_kms (&dev_priv->drm,"Disabling DC9\n" ); - -gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); - -intel_pps_unlock_regs_wa (dev_priv); -} - -static void assert_dmc_loaded (struct drm_i915_private *dev_priv) -{ -drm_WARN_ONCE (&dev_priv->drm, - !intel_de_read (dev_priv, -DMC_PROGRAM (dev_priv->dmc.dmc_info[DMC_FW_MAIN ].start_mmioaddr,0 )), -"DMC program storage start is NULL\n" ); -drm_WARN_ONCE (&dev_priv->drm, !intel_de_read (dev_priv,DMC_SSP_BASE ), -"DMC SSP Base Not fine\n" ); -drm_WARN_ONCE (&dev_priv->drm, !intel_de_read (dev_priv,DMC_HTP_SKL ), -"DMC HTP Not fine\n" ); -} -/** * intel_display_power_set_target_dc_state - Set target dc state. * @dev_priv: i915 device
@@ -961,912 +296,8 @@ void intel_display_power_set_target_dc_state(struct drm_i915_private *dev_priv,mutex_unlock (&power_domains->lock); } -static void assert_can_enable_dc5 (struct drm_i915_private *dev_priv) -{ -enum i915_power_well_id high_pg; - -/* Power wells at this level and above must be disabled for DC5 entry */ -if (DISPLAY_VER (dev_priv) ==12 ) - high_pg =ICL_DISP_PW_3 ; -else - high_pg =SKL_DISP_PW_2 ; - -drm_WARN_ONCE (&dev_priv->drm, -intel_display_power_well_is_enabled (dev_priv, high_pg), -"Power wells above platform's DC5 limit still enabled.\n" ); - -drm_WARN_ONCE (&dev_priv->drm, - (intel_de_read (dev_priv,DC_STATE_EN ) & -DC_STATE_EN_UPTO_DC5 ), -"DC5 already programmed to be enabled.\n" ); -assert_rpm_wakelock_held (&dev_priv->runtime_pm); - -assert_dmc_loaded (dev_priv); -} - -static void gen9_enable_dc5 (struct drm_i915_private *dev_priv) -{ -assert_can_enable_dc5 (dev_priv); - -drm_dbg_kms (&dev_priv->drm,"Enabling DC5\n" ); - -/* Wa Display #1183: skl,kbl,cfl */ -if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv)) -intel_de_write (dev_priv,GEN8_CHICKEN_DCPR_1 , -intel_de_read (dev_priv,GEN8_CHICKEN_DCPR_1 ) |SKL_SELECT_ALTERNATE_DC_EXIT ); - -gen9_set_dc_state (dev_priv,DC_STATE_EN_UPTO_DC5 ); -} - -static void assert_can_enable_dc6 (struct drm_i915_private *dev_priv) -{ -drm_WARN_ONCE (&dev_priv->drm, -intel_de_read (dev_priv,UTIL_PIN_CTL ) &UTIL_PIN_ENABLE , -"Backlight is not disabled.\n" ); -drm_WARN_ONCE (&dev_priv->drm, - (intel_de_read (dev_priv,DC_STATE_EN ) & -DC_STATE_EN_UPTO_DC6 ), -"DC6 already programmed to be enabled.\n" ); - -assert_dmc_loaded (dev_priv); -} - -static void skl_enable_dc6 (struct drm_i915_private *dev_priv) -{ -assert_can_enable_dc6 (dev_priv); - -drm_dbg_kms (&dev_priv->drm,"Enabling DC6\n" ); - -/* Wa Display #1183: skl,kbl,cfl */ -if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv)) -intel_de_write (dev_priv,GEN8_CHICKEN_DCPR_1 , -intel_de_read (dev_priv,GEN8_CHICKEN_DCPR_1 ) |SKL_SELECT_ALTERNATE_DC_EXIT ); - -gen9_set_dc_state (dev_priv,DC_STATE_EN_UPTO_DC6 ); -} - -static void hsw_power_well_sync_hw (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -int pw_idx = power_well->desc->hsw.idx; -u32 mask =HSW_PWR_WELL_CTL_REQ (pw_idx); -u32 bios_req =intel_de_read (dev_priv, regs->bios); - -/* Take over the request bit if set by BIOS. */ -if (bios_req & mask) { -u32 drv_req =intel_de_read (dev_priv, regs->driver); - -if (!(drv_req & mask)) -intel_de_write (dev_priv, regs->driver, drv_req | mask); -intel_de_write (dev_priv, regs->bios, bios_req & ~mask); - } -} - -static void bxt_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -bxt_ddi_phy_init (dev_priv, power_well->desc->bxt.phy); -} - -static void bxt_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -bxt_ddi_phy_uninit (dev_priv, power_well->desc->bxt.phy); -} - -static bool bxt_dpio_cmn_power_well_enabled (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -return bxt_ddi_phy_is_enabled (dev_priv, power_well->desc->bxt.phy); -} - -static void bxt_verify_ddi_phy_power_wells (struct drm_i915_private *dev_priv) -{ -struct i915_power_well *power_well; - - power_well =lookup_power_well (dev_priv,BXT_DISP_PW_DPIO_CMN_A ); -if (intel_power_well_refcount (power_well) >0 ) -bxt_ddi_phy_verify_state (dev_priv, power_well->desc->bxt.phy); - - power_well =lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC ); -if (intel_power_well_refcount (power_well) >0 ) -bxt_ddi_phy_verify_state (dev_priv, power_well->desc->bxt.phy); - -if (IS_GEMINILAKE (dev_priv)) { - power_well =lookup_power_well (dev_priv, -GLK_DISP_PW_DPIO_CMN_C ); -if (intel_power_well_refcount (power_well) >0 ) -bxt_ddi_phy_verify_state (dev_priv, - power_well->desc->bxt.phy); - } -} - -static bool gen9_dc_off_power_well_enabled (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -return ((intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_DC3CO ) ==0 && - (intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5_DC6_MASK ) ==0 ); -} - -static void gen9_assert_dbuf_enabled (struct drm_i915_private *dev_priv) -{ -u8 hw_enabled_dbuf_slices =intel_enabled_dbuf_slices_mask (dev_priv); -u8 enabled_dbuf_slices = dev_priv->dbuf.enabled_slices; - -drm_WARN (&dev_priv->drm, - hw_enabled_dbuf_slices != enabled_dbuf_slices, -"Unexpected DBuf power power state (0x%08x, expected 0x%08x)\n" , - hw_enabled_dbuf_slices, - enabled_dbuf_slices); -} - -static void gen9_disable_dc_states (struct drm_i915_private *dev_priv) -{ -struct intel_cdclk_config cdclk_config = {}; - -if (dev_priv->dmc.target_dc_state ==DC_STATE_EN_DC3CO ) { -tgl_disable_dc3co (dev_priv); -return ; - } - -gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); - -if (!HAS_DISPLAY (dev_priv)) -return ; - -intel_cdclk_get_cdclk (dev_priv, &cdclk_config); -/* Can't read out voltage_level so can't use intel_cdclk_changed() */ -drm_WARN_ON (&dev_priv->drm, -intel_cdclk_needs_modeset (&dev_priv->cdclk.hw, - &cdclk_config)); - -gen9_assert_dbuf_enabled (dev_priv); - -if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) -bxt_verify_ddi_phy_power_wells (dev_priv); - -if (DISPLAY_VER (dev_priv) >=11 ) -/* -* DMC retains HW context only for port A, the other combo -* PHY's HW context for port B is lost after DC transitions, -* so we need to restore it manually. -*/ -intel_combo_phy_init (dev_priv); -} - -static void gen9_dc_off_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -gen9_disable_dc_states (dev_priv); -} - -static void gen9_dc_off_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -if (!intel_dmc_has_payload (dev_priv)) -return ; - -switch (dev_priv->dmc.target_dc_state) { -case DC_STATE_EN_DC3CO : -tgl_enable_dc3co (dev_priv); -break ; -case DC_STATE_EN_UPTO_DC6 : -skl_enable_dc6 (dev_priv); -break ; -case DC_STATE_EN_UPTO_DC5 : -gen9_enable_dc5 (dev_priv); -break ; - } -} - -static void i9xx_power_well_sync_hw_noop (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -} - -static void i9xx_always_on_power_well_noop (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -} - -static bool i9xx_always_on_power_well_enabled (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -return true; -} - -static void i830_pipes_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -if ((intel_de_read (dev_priv,PIPECONF (PIPE_A )) &PIPECONF_ENABLE ) ==0 ) -i830_enable_pipe (dev_priv,PIPE_A ); -if ((intel_de_read (dev_priv,PIPECONF (PIPE_B )) &PIPECONF_ENABLE ) ==0 ) -i830_enable_pipe (dev_priv,PIPE_B ); -} - -static void i830_pipes_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -i830_disable_pipe (dev_priv,PIPE_B ); -i830_disable_pipe (dev_priv,PIPE_A ); -} - -static bool i830_pipes_power_well_enabled (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -return intel_de_read (dev_priv,PIPECONF (PIPE_A )) &PIPECONF_ENABLE && -intel_de_read (dev_priv,PIPECONF (PIPE_B )) &PIPECONF_ENABLE ; -} - -static void i830_pipes_power_well_sync_hw (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -if (intel_power_well_refcount (power_well) >0 ) -i830_pipes_power_well_enable (dev_priv, power_well); -else -i830_pipes_power_well_disable (dev_priv, power_well); -} - -static void vlv_set_power_well (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well,bool enable) -{ -int pw_idx = power_well->desc->vlv.idx; -u32 mask; -u32 state; -u32 ctrl; - - mask =PUNIT_PWRGT_MASK (pw_idx); - state = enable ?PUNIT_PWRGT_PWR_ON (pw_idx) : -PUNIT_PWRGT_PWR_GATE (pw_idx); - -vlv_punit_get (dev_priv); - -#define COND \ - ((vlv_punit_read(dev_priv, PUNIT_REG_PWRGT_STATUS) & mask) == state) - -if (COND ) - goto out; - - ctrl =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL ); - ctrl &= ~mask; - ctrl |= state; -vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL , ctrl); - -if (wait_for (COND ,100 )) -drm_err (&dev_priv->drm, -"timeout setting power well state %08x (%08x)\n" , - state, -vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL )); - -#undef COND - -out: -vlv_punit_put (dev_priv); -} - -static void vlv_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -vlv_set_power_well (dev_priv, power_well, true); -} - -static void vlv_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -vlv_set_power_well (dev_priv, power_well, false); -} - -static bool vlv_power_well_enabled (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -int pw_idx = power_well->desc->vlv.idx; -bool enabled = false; -u32 mask; -u32 state; -u32 ctrl; - - mask =PUNIT_PWRGT_MASK (pw_idx); - ctrl =PUNIT_PWRGT_PWR_ON (pw_idx); - -vlv_punit_get (dev_priv); - - state =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_STATUS ) & mask; -/* -* We only ever set the power-on and power-gate states, anything -* else is unexpected. -*/ -drm_WARN_ON (&dev_priv->drm, state !=PUNIT_PWRGT_PWR_ON (pw_idx) && - state !=PUNIT_PWRGT_PWR_GATE (pw_idx)); -if (state == ctrl) - enabled = true; - -/* -* A transient state at this point would mean some unexpected party -* is poking at the power controls too. -*/ - ctrl =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL ) & mask; -drm_WARN_ON (&dev_priv->drm, ctrl != state); - -vlv_punit_put (dev_priv); - -return enabled; -} - -static void vlv_init_display_clock_gating (struct drm_i915_private *dev_priv) -{ -u32 val; - -/* -* On driver load, a pipe may be active and driving a DSI display. -* Preserve DPOUNIT_CLOCK_GATE_DISABLE to avoid the pipe getting stuck -* (and never recovering) in this case. intel_dsi_post_disable() will -* clear it when we turn off the display. -*/ - val =intel_de_read (dev_priv,DSPCLK_GATE_D ); - val &=DPOUNIT_CLOCK_GATE_DISABLE ; - val |=VRHUNIT_CLOCK_GATE_DISABLE ; -intel_de_write (dev_priv,DSPCLK_GATE_D , val); - -/* -* Disable trickle feed and enable pnd deadline calculation -*/ -intel_de_write (dev_priv,MI_ARB_VLV , -MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE ); -intel_de_write (dev_priv,CBR1_VLV ,0 ); - -drm_WARN_ON (&dev_priv->drm,RUNTIME_INFO (dev_priv)->rawclk_freq ==0 ); -intel_de_write (dev_priv,RAWCLK_FREQ_VLV , -DIV_ROUND_CLOSEST (RUNTIME_INFO (dev_priv)->rawclk_freq, -1000 )); -} - -static void vlv_display_power_well_init (struct drm_i915_private *dev_priv) -{ -struct intel_encoder *encoder; -enum pipe pipe; - -/* -* Enable the CRI clock source so we can get at the -* display and the reference clock for VGA -* hotplug / manual detection. Supposedly DSI also -* needs the ref clock up and running. -* -* CHV DPLL B/C have some issues if VGA mode is enabled. -*/ -for_each_pipe (dev_priv, pipe) { -u32 val =intel_de_read (dev_priv,DPLL (pipe)); - - val |=DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; -if (pipe !=PIPE_A ) - val |=DPLL_INTEGRATED_CRI_CLK_VLV ; - -intel_de_write (dev_priv,DPLL (pipe), val); - } - -vlv_init_display_clock_gating (dev_priv); - -spin_lock_irq (&dev_priv->irq_lock); -valleyview_enable_display_irqs (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); - -/* -* During driver initialization/resume we can avoid restoring the -* part of the HW/SW state that will be inited anyway explicitly. -*/ -if (dev_priv->power_domains.initializing) -return ; - -intel_hpd_init (dev_priv); -intel_hpd_poll_disable (dev_priv); - -/* Re-enable the ADPA, if we have one */ -for_each_intel_encoder (&dev_priv->drm, encoder) { -if (encoder->type ==INTEL_OUTPUT_ANALOG ) -intel_crt_reset (&encoder->base); - } - -intel_vga_redisable_power_on (dev_priv); - -intel_pps_unlock_regs_wa (dev_priv); -} - -static void vlv_display_power_well_deinit (struct drm_i915_private *dev_priv) -{ -spin_lock_irq (&dev_priv->irq_lock); -valleyview_disable_display_irqs (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); - -/* make sure we're done processing display irqs */ -intel_synchronize_irq (dev_priv); - -intel_pps_reset_all (dev_priv); - -/* Prevent us from re-enabling polling on accident in late suspend */ -if (!dev_priv->drm.dev->power.is_suspended) -intel_hpd_poll_enable (dev_priv); -} - -static void vlv_display_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -vlv_set_power_well (dev_priv, power_well, true); - -vlv_display_power_well_init (dev_priv); -} - -static void vlv_display_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -vlv_display_power_well_deinit (dev_priv); - -vlv_set_power_well (dev_priv, power_well, false); -} - -static void vlv_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -/* since ref/cri clock was enabled */ -udelay (1 );/* >10ns for cmnreset, >0ns for sidereset */ - -vlv_set_power_well (dev_priv, power_well, true); - -/* -* From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx - -* 6. De-assert cmn_reset/side_reset. Same as VLV X0. -* a. GUnit 0x2110 bit[0] set to 1 (def 0) -* b. The other bits such as sfr settings / modesel may all -* be set to 0. -* -* This should only be done on init and resume from S3 with -* both PLLs disabled, or we risk losing DPIO and PLL -* synchronization. -*/ -intel_de_write (dev_priv,DPIO_CTL , -intel_de_read (dev_priv,DPIO_CTL ) |DPIO_CMNRST ); -} - -static void vlv_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -enum pipe pipe; - -for_each_pipe (dev_priv, pipe) -assert_pll_disabled (dev_priv, pipe); - -/* Assert common reset */ -intel_de_write (dev_priv,DPIO_CTL , -intel_de_read (dev_priv,DPIO_CTL ) & ~DPIO_CMNRST ); - -vlv_set_power_well (dev_priv, power_well, false); -} -#define POWER_DOMAIN_MASK (GENMASK_ULL(POWER_DOMAIN_NUM - 1, 0)) -#define BITS_SET (val, bits) (((val) & (bits)) == (bits)) - -static void assert_chv_phy_status (struct drm_i915_private *dev_priv) -{ -struct i915_power_well *cmn_bc = -lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC ); -struct i915_power_well *cmn_d = -lookup_power_well (dev_priv,CHV_DISP_PW_DPIO_CMN_D ); -u32 phy_control = dev_priv->chv_phy_control; -u32 phy_status =0 ; -u32 phy_status_mask =0xffffffff ; - -/* -* The BIOS can leave the PHY is some weird state -* where it doesn't fully power down some parts. -* Disable the asserts until the PHY has been fully -* reset (ie. the power well has been disabled at -* least once). -*/ -if (!dev_priv->chv_phy_assert[DPIO_PHY0 ]) - phy_status_mask &= ~(PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH0 ) | -PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH0 ,0 ) | -PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH0 ,1 ) | -PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH1 ) | -PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH1 ,0 ) | -PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH1 ,1 )); - -if (!dev_priv->chv_phy_assert[DPIO_PHY1 ]) - phy_status_mask &= ~(PHY_STATUS_CMN_LDO (DPIO_PHY1 ,DPIO_CH0 ) | -PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,0 ) | -PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,1 )); - -if (intel_power_well_is_enabled (dev_priv, cmn_bc)) { - phy_status |=PHY_POWERGOOD (DPIO_PHY0 ); - -/* this assumes override is only used to enable lanes */ -if ((phy_control &PHY_CH_POWER_DOWN_OVRD_EN (DPIO_PHY0 ,DPIO_CH0 )) ==0 ) - phy_control |=PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH0 ); - -if ((phy_control &PHY_CH_POWER_DOWN_OVRD_EN (DPIO_PHY0 ,DPIO_CH1 )) ==0 ) - phy_control |=PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH1 ); - -/* CL1 is on whenever anything is on in either channel */ -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH0 ) | -PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH1 ))) - phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH0 ); - -/* -* The DPLLB check accounts for the pipe B + port A usage -* with CL2 powered up but all the lanes in the second channel -* powered down. -*/ -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH1 )) && - (intel_de_read (dev_priv,DPLL (PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) - phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH1 ); - -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0x3 ,DPIO_PHY0 ,DPIO_CH0 ))) - phy_status |=PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH0 ,0 ); -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0xc ,DPIO_PHY0 ,DPIO_CH0 ))) - phy_status |=PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH0 ,1 ); - -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0x3 ,DPIO_PHY0 ,DPIO_CH1 ))) - phy_status |=PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH1 ,0 ); -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0xc ,DPIO_PHY0 ,DPIO_CH1 ))) - phy_status |=PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH1 ,1 ); - } - -if (intel_power_well_is_enabled (dev_priv, cmn_d)) { - phy_status |=PHY_POWERGOOD (DPIO_PHY1 ); - -/* this assumes override is only used to enable lanes */ -if ((phy_control &PHY_CH_POWER_DOWN_OVRD_EN (DPIO_PHY1 ,DPIO_CH0 )) ==0 ) - phy_control |=PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY1 ,DPIO_CH0 ); - -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY1 ,DPIO_CH0 ))) - phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY1 ,DPIO_CH0 ); - -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0x3 ,DPIO_PHY1 ,DPIO_CH0 ))) - phy_status |=PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,0 ); -if (BITS_SET (phy_control, -PHY_CH_POWER_DOWN_OVRD (0xc ,DPIO_PHY1 ,DPIO_CH0 ))) - phy_status |=PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,1 ); - } - - phy_status &= phy_status_mask; - -/* -* The PHY may be busy with some initial calibration and whatnot, -* so the power state can take a while to actually change. -*/ -if (intel_de_wait_for_register (dev_priv,DISPLAY_PHY_STATUS , - phy_status_mask, phy_status,10 )) -drm_err (&dev_priv->drm, -"Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n" , -intel_de_read (dev_priv,DISPLAY_PHY_STATUS ) & phy_status_mask, - phy_status, dev_priv->chv_phy_control); -} - -#undef BITS_SET - -static void chv_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -enum dpio_phy phy; -enum pipe pipe; -u32 tmp; - -drm_WARN_ON_ONCE (&dev_priv->drm, - power_well->desc->id !=VLV_DISP_PW_DPIO_CMN_BC && - power_well->desc->id !=CHV_DISP_PW_DPIO_CMN_D ); - -if (power_well->desc->id ==VLV_DISP_PW_DPIO_CMN_BC ) { - pipe =PIPE_A ; - phy =DPIO_PHY0 ; - }else { - pipe =PIPE_C ; - phy =DPIO_PHY1 ; - } - -/* since ref/cri clock was enabled */ -udelay (1 );/* >10ns for cmnreset, >0ns for sidereset */ -vlv_set_power_well (dev_priv, power_well, true); - -/* Poll for phypwrgood signal */ -if (intel_de_wait_for_set (dev_priv,DISPLAY_PHY_STATUS , -PHY_POWERGOOD (phy),1 )) -drm_err (&dev_priv->drm,"Display PHY %d is not power up\n" , - phy); - -vlv_dpio_get (dev_priv); - -/* Enable dynamic power down */ - tmp =vlv_dpio_read (dev_priv, pipe,CHV_CMN_DW28 ); - tmp |=DPIO_DYNPWRDOWNEN_CH0 |DPIO_CL1POWERDOWNEN | -DPIO_SUS_CLK_CONFIG_GATE_CLKREQ ; -vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW28 , tmp); - -if (power_well->desc->id ==VLV_DISP_PW_DPIO_CMN_BC ) { - tmp =vlv_dpio_read (dev_priv, pipe, _CHV_CMN_DW6_CH1); - tmp |=DPIO_DYNPWRDOWNEN_CH1 ; -vlv_dpio_write (dev_priv, pipe, _CHV_CMN_DW6_CH1, tmp); - }else { -/* -* Force the non-existing CL2 off. BXT does this -* too, so maybe it saves some power even though -* CL2 doesn't exist? -*/ - tmp =vlv_dpio_read (dev_priv, pipe,CHV_CMN_DW30 ); - tmp |=DPIO_CL2_LDOFUSE_PWRENB ; -vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW30 , tmp); - } - -vlv_dpio_put (dev_priv); - - dev_priv->chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); - -drm_dbg_kms (&dev_priv->drm, -"Enabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->chv_phy_control); - -assert_chv_phy_status (dev_priv); -} - -static void chv_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -enum dpio_phy phy; - -drm_WARN_ON_ONCE (&dev_priv->drm, - power_well->desc->id !=VLV_DISP_PW_DPIO_CMN_BC && - power_well->desc->id !=CHV_DISP_PW_DPIO_CMN_D ); - -if (power_well->desc->id ==VLV_DISP_PW_DPIO_CMN_BC ) { - phy =DPIO_PHY0 ; -assert_pll_disabled (dev_priv,PIPE_A ); -assert_pll_disabled (dev_priv,PIPE_B ); - }else { - phy =DPIO_PHY1 ; -assert_pll_disabled (dev_priv,PIPE_C ); - } - - dev_priv->chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); - -vlv_set_power_well (dev_priv, power_well, false); - -drm_dbg_kms (&dev_priv->drm, -"Disabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->chv_phy_control); - -/* PHY is fully reset now, so we can enable the PHY state asserts */ - dev_priv->chv_phy_assert[phy] = true; - -assert_chv_phy_status (dev_priv); -} - -static void assert_chv_phy_powergate (struct drm_i915_private *dev_priv,enum dpio_phy phy, -enum dpio_channel ch,bool override,unsigned int mask) -{ -enum pipe pipe = phy ==DPIO_PHY0 ?PIPE_A :PIPE_C ; -u32 reg, val, expected, actual; - -/* -* The BIOS can leave the PHY is some weird state -* where it doesn't fully power down some parts. -* Disable the asserts until the PHY has been fully -* reset (ie. the power well has been disabled at -* least once). -*/ -if (!dev_priv->chv_phy_assert[phy]) -return ; - -if (ch ==DPIO_CH0 ) - reg = _CHV_CMN_DW0_CH0; -else - reg = _CHV_CMN_DW6_CH1; - -vlv_dpio_get (dev_priv); - val =vlv_dpio_read (dev_priv, pipe, reg); -vlv_dpio_put (dev_priv); - -/* -* This assumes !override is only used when the port is disabled. -* All lanes should power down even without the override when -* the port is disabled. -*/ -if (!override || mask ==0xf ) { - expected =DPIO_ALLDL_POWERDOWN |DPIO_ANYDL_POWERDOWN ; -/* -* If CH1 common lane is not active anymore -* (eg. for pipe B DPLL) the entire channel will -* shut down, which causes the common lane registers -* to read as 0. That means we can't actually check -* the lane power down status bits, but as the entire -* register reads as 0 it's a good indication that the -* channel is indeed entirely powered down. -*/ -if (ch ==DPIO_CH1 && val ==0 ) - expected =0 ; - }else if (mask !=0x0 ) { - expected =DPIO_ANYDL_POWERDOWN ; - }else { - expected =0 ; - } - -if (ch ==DPIO_CH0 ) - actual = val >>DPIO_ANYDL_POWERDOWN_SHIFT_CH0 ; -else - actual = val >>DPIO_ANYDL_POWERDOWN_SHIFT_CH1 ; - actual &=DPIO_ALLDL_POWERDOWN |DPIO_ANYDL_POWERDOWN ; - -drm_WARN (&dev_priv->drm, actual != expected, -"Unexpected DPIO lane power down: all %d, any %d. Expected: all %d, any %d. (0x%x = 0x%08x)\n" , - !!(actual &DPIO_ALLDL_POWERDOWN ), - !!(actual &DPIO_ANYDL_POWERDOWN ), - !!(expected &DPIO_ALLDL_POWERDOWN ), - !!(expected &DPIO_ANYDL_POWERDOWN ), - reg, val); -} - -bool chv_phy_powergate_ch (struct drm_i915_private *dev_priv,enum dpio_phy phy, -enum dpio_channel ch,bool override) -{ -struct i915_power_domains *power_domains = &dev_priv->power_domains; -bool was_override; - -mutex_lock (&power_domains->lock); - - was_override = dev_priv->chv_phy_control &PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); - -if (override == was_override) - goto out; - -if (override) - dev_priv->chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -else - dev_priv->chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); - -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); - -drm_dbg_kms (&dev_priv->drm, -"Power gating DPIO PHY%d CH%d (DPIO_PHY_CONTROL=0x%08x)\n" , - phy, ch, dev_priv->chv_phy_control); - -assert_chv_phy_status (dev_priv); - -out: -mutex_unlock (&power_domains->lock); - -return was_override; -} - -void chv_phy_powergate_lanes (struct intel_encoder *encoder, -bool override,unsigned int mask) -{ -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct i915_power_domains *power_domains = &dev_priv->power_domains; -enum dpio_phy phy =vlv_dig_port_to_phy (enc_to_dig_port (encoder)); -enum dpio_channel ch =vlv_dig_port_to_channel (enc_to_dig_port (encoder)); - -mutex_lock (&power_domains->lock); - - dev_priv->chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD (0xf , phy, ch); - dev_priv->chv_phy_control |=PHY_CH_POWER_DOWN_OVRD (mask, phy, ch); - -if (override) - dev_priv->chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -else - dev_priv->chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); - -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); - -drm_dbg_kms (&dev_priv->drm, -"Power gating DPIO PHY%d CH%d lanes 0x%x (PHY_CONTROL=0x%08x)\n" , - phy, ch, mask, dev_priv->chv_phy_control); - -assert_chv_phy_status (dev_priv); - -assert_chv_phy_powergate (dev_priv, phy, ch, override, mask); - -mutex_unlock (&power_domains->lock); -} - -static bool chv_pipe_power_well_enabled (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -enum pipe pipe =PIPE_A ; -bool enabled; -u32 state, ctrl; - -vlv_punit_get (dev_priv); - - state =vlv_punit_read (dev_priv,PUNIT_REG_DSPSSPM ) &DP_SSS_MASK (pipe); -/* -* We only ever set the power-on and power-gate states, anything -* else is unexpected. -*/ -drm_WARN_ON (&dev_priv->drm, state !=DP_SSS_PWR_ON (pipe) && - state !=DP_SSS_PWR_GATE (pipe)); - enabled = state ==DP_SSS_PWR_ON (pipe); - -/* -* A transient state at this point would mean some unexpected party -* is poking at the power controls too. -*/ - ctrl =vlv_punit_read (dev_priv,PUNIT_REG_DSPSSPM ) &DP_SSC_MASK (pipe); -drm_WARN_ON (&dev_priv->drm, ctrl <<16 != state); - -vlv_punit_put (dev_priv); - -return enabled; -} - -static void chv_set_pipe_power_well (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well, -bool enable) -{ -enum pipe pipe =PIPE_A ; -u32 state; -u32 ctrl; - - state = enable ?DP_SSS_PWR_ON (pipe) :DP_SSS_PWR_GATE (pipe); - -vlv_punit_get (dev_priv); - -#define COND \ - ((vlv_punit_read(dev_priv, PUNIT_REG_DSPSSPM) & DP_SSS_MASK(pipe)) == state) - -if (COND ) - goto out; - - ctrl =vlv_punit_read (dev_priv,PUNIT_REG_DSPSSPM ); - ctrl &= ~DP_SSC_MASK (pipe); - ctrl |= enable ?DP_SSC_PWR_ON (pipe) :DP_SSC_PWR_GATE (pipe); -vlv_punit_write (dev_priv,PUNIT_REG_DSPSSPM , ctrl); - -if (wait_for (COND ,100 )) -drm_err (&dev_priv->drm, -"timeout setting power well state %08x (%08x)\n" , - state, -vlv_punit_read (dev_priv,PUNIT_REG_DSPSSPM )); - -#undef COND - -out: -vlv_punit_put (dev_priv); -} - -static void chv_pipe_power_well_sync_hw (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); -} - -static void chv_pipe_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -chv_set_pipe_power_well (dev_priv, power_well, true); - -vlv_display_power_well_init (dev_priv); -} - -static void chv_pipe_power_well_disable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -vlv_display_power_well_deinit (dev_priv); - -chv_set_pipe_power_well (dev_priv, power_well, false); -} -static u64 __async_put_domains_mask (struct i915_power_domains *power_domains) { return power_domains->async_put_domains[0] |
@@ -3046,27 +1477,6 @@ intel_display_power_put_mask_in_set(struct drm_i915_private *i915,#define XELPD_DDI_IO_TC3_POWER_DOMAINS BIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC3)#define XELPD_DDI_IO_TC4_POWER_DOMAINS BIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC4) -static const struct i915_power_well_ops i9xx_always_on_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = i9xx_always_on_power_well_noop, - .disable = i9xx_always_on_power_well_noop, - .is_enabled = i9xx_always_on_power_well_enabled, -}; - -static const struct i915_power_well_ops chv_pipe_power_well_ops = { - .sync_hw = chv_pipe_power_well_sync_hw, - .enable = chv_pipe_power_well_enable, - .disable = chv_pipe_power_well_disable, - .is_enabled = chv_pipe_power_well_enabled, -}; - -static const struct i915_power_well_ops chv_dpio_cmn_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = chv_dpio_cmn_power_well_enable, - .disable = chv_dpio_cmn_power_well_disable, - .is_enabled = vlv_power_well_enabled, -}; -static const struct i915_power_well_desc i9xx_always_on_power_well[] = { { .name ="always-on" ,
@@ -3077,13 +1487,6 @@ static const struct i915_power_well_desc i9xx_always_on_power_well[] = { }, }; -static const struct i915_power_well_ops i830_pipes_power_well_ops = { - .sync_hw = i830_pipes_power_well_sync_hw, - .enable = i830_pipes_power_well_enable, - .disable = i830_pipes_power_well_disable, - .is_enabled = i830_pipes_power_well_enabled, -}; -static const struct i915_power_well_desc i830_power_wells[] = { { .name ="always-on" ,
@@ -3100,35 +1503,6 @@ static const struct i915_power_well_desc i830_power_wells[] = { }, }; -static const struct i915_power_well_regs hsw_power_well_regs = { - .bios =HSW_PWR_WELL_CTL1 , - .driver =HSW_PWR_WELL_CTL2 , - .kvmr =HSW_PWR_WELL_CTL3 , - .debug =HSW_PWR_WELL_CTL4 , -}; - -static const struct i915_power_well_ops hsw_power_well_ops = { - .regs = &hsw_power_well_regs, - .sync_hw = hsw_power_well_sync_hw, - .enable = hsw_power_well_enable, - .disable = hsw_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; - -static const struct i915_power_well_ops gen9_dc_off_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = gen9_dc_off_power_well_enable, - .disable = gen9_dc_off_power_well_disable, - .is_enabled = gen9_dc_off_power_well_enabled, -}; - -static const struct i915_power_well_ops bxt_dpio_cmn_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = bxt_dpio_cmn_power_well_enable, - .disable = bxt_dpio_cmn_power_well_disable, - .is_enabled = bxt_dpio_cmn_power_well_enabled, -}; -static const struct i915_power_well_desc hsw_power_wells[] = { { .name ="always-on" ,
@@ -3170,27 +1544,6 @@ static const struct i915_power_well_desc bdw_power_wells[] = { }, }; -static const struct i915_power_well_ops vlv_display_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = vlv_display_power_well_enable, - .disable = vlv_display_power_well_disable, - .is_enabled = vlv_power_well_enabled, -}; - -static const struct i915_power_well_ops vlv_dpio_cmn_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = vlv_dpio_cmn_power_well_enable, - .disable = vlv_dpio_cmn_power_well_disable, - .is_enabled = vlv_power_well_enabled, -}; - -static const struct i915_power_well_ops vlv_dpio_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = vlv_power_well_enable, - .disable = vlv_power_well_disable, - .is_enabled = vlv_power_well_enabled, -}; -static const struct i915_power_well_desc vlv_power_wells[] = { { .name ="always-on" ,
@@ -3572,34 +1925,6 @@ static const struct i915_power_well_desc glk_power_wells[] = { }, }; -static const struct i915_power_well_regs icl_aux_power_well_regs = { - .bios =ICL_PWR_WELL_CTL_AUX1 , - .driver =ICL_PWR_WELL_CTL_AUX2 , - .debug =ICL_PWR_WELL_CTL_AUX4 , -}; - -static const struct i915_power_well_ops icl_aux_power_well_ops = { - .regs = &icl_aux_power_well_regs, - .sync_hw = hsw_power_well_sync_hw, - .enable = icl_aux_power_well_enable, - .disable = icl_aux_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; - -static const struct i915_power_well_regs icl_ddi_power_well_regs = { - .bios =ICL_PWR_WELL_CTL_DDI1 , - .driver =ICL_PWR_WELL_CTL_DDI2 , - .debug =ICL_PWR_WELL_CTL_DDI4 , -}; - -static const struct i915_power_well_ops icl_ddi_power_well_ops = { - .regs = &icl_ddi_power_well_regs, - .sync_hw = hsw_power_well_sync_hw, - .enable = hsw_power_well_enable, - .disable = hsw_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; -static const struct i915_power_well_desc icl_power_wells[] = { { .name ="always-on" ,
@@ -3813,90 +2138,6 @@ static const struct i915_power_well_desc icl_power_wells[] = { }, }; -static void -tgl_tc_cold_request (struct drm_i915_private *i915,bool block) -{ -u8 tries =0 ; -int ret; - -while (1 ) { -u32 low_val; -u32 high_val =0 ; - -if (block) - low_val =TGL_PCODE_EXIT_TCCOLD_DATA_L_BLOCK_REQ ; -else - low_val =TGL_PCODE_EXIT_TCCOLD_DATA_L_UNBLOCK_REQ ; - -/* -* Spec states that we should timeout the request after 200us -* but the function below will timeout after 500us -*/ - ret =snb_pcode_read (i915,TGL_PCODE_TCCOLD , &low_val, &high_val); -if (ret ==0 ) { -if (block && - (low_val &TGL_PCODE_EXIT_TCCOLD_DATA_L_EXIT_FAILED )) - ret = -EIO ; -else -break ; - } - -if (++tries ==3 ) -break ; - -msleep (1 ); - } - -if (ret) -drm_err (&i915->drm,"TC cold %sblock failed\n" , - block ?"" :"un" ); -else -drm_dbg_kms (&i915->drm,"TC cold %sblock succeeded\n" , - block ?"" :"un" ); -} - -static void -tgl_tc_cold_off_power_well_enable (struct drm_i915_private *i915, -struct i915_power_well *power_well) -{ -tgl_tc_cold_request (i915, true); -} - -static void -tgl_tc_cold_off_power_well_disable (struct drm_i915_private *i915, -struct i915_power_well *power_well) -{ -tgl_tc_cold_request (i915, false); -} - -static void -tgl_tc_cold_off_power_well_sync_hw (struct drm_i915_private *i915, -struct i915_power_well *power_well) -{ -if (intel_power_well_refcount (power_well) >0 ) -tgl_tc_cold_off_power_well_enable (i915, power_well); -else -tgl_tc_cold_off_power_well_disable (i915, power_well); -} - -static bool -tgl_tc_cold_off_power_well_is_enabled (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -/* -* Not the correctly implementation but there is no way to just read it -* from PCODE, so returning count to avoid state mismatch errors -*/ -return intel_power_well_refcount (power_well); -} - -static const struct i915_power_well_ops tgl_tc_cold_off_ops = { - .sync_hw = tgl_tc_cold_off_power_well_sync_hw, - .enable = tgl_tc_cold_off_power_well_enable, - .disable = tgl_tc_cold_off_power_well_disable, - .is_enabled = tgl_tc_cold_off_power_well_is_enabled, -}; -static const struct i915_power_well_desc tgl_power_wells[] = { { .name ="always-on" ,
drivers/gpu/drm/i915/display/intel_display_power.h +0 -5
@@ -305,9 +305,4 @@ void gen9_dbuf_slices_update(struct drm_i915_private *dev_priv,for ((wf) =intel_display_power_get_if_enabled ((i915), (domain)); (wf); \ intel_display_power_put_async((i915), (domain), (wf)), (wf) = 0) -void chv_phy_powergate_lanes(struct intel_encoder *encoder, - bool override, unsigned int mask); -bool chv_phy_powergate_ch (struct drm_i915_private *dev_priv,enum dpio_phy phy, -enum dpio_channel ch,bool override); -#endif /* __INTEL_DISPLAY_POWER_H__ */
drivers/gpu/drm/i915/display/intel_display_power_well.c +1817 -0
1,160 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_well.h +27 -35
62 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dpio_phy.c +1 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_pps.c +1 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.30.2
Part of the diff is not shown here. View the raw message.
Re: [Intel-gfx] [PATCH v3 01/18] drm/i915: Move per-platform power well hooks to intel_display_power_well.c
Quoted 15 lines · Imre Deak
Move the implementation of platform specific power well hooks to
intel_display_power_well.c, to reduce the clutter inintel_display_power.c.The locking of all the power domain/power well state is handled in the
power domain functions inintel_display_power.cusingi915_power_domains::lock. This patch also moves the chy_phy_powergate_ch/lanes() functions tointel_display_power_well.cwhich borrow the same lock to protect theDISPLAY_PHY_CONTROLregister
state, which the HW uses both for toggling power wells and power gating
PHY lanes.
Quoted 1 line
No functional change.
Quoted 4,453 lines
v2:
- Clarify in the commit log why CHV functions using thei915_power_domains::lockwere moved, while others locking the power domain/well state were kept inintel_display_power.c. (Jouni)
- Move forward declaration of chv_phy_powergate_ch/lanes() tointel_display_power_well.h.Signed-off-by Imre Deak <[email protected]>--- .../drm/i915/display/intel_display_power.c | 1759 ------------- --- .../drm/i915/display/intel_display_power.h | 5 - .../i915/display/intel_display_power_well.c | 1817 +++++++++++++++++ .../i915/display/intel_display_power_well.h | 62 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 1 + drivers/gpu/drm/i915/display/intel_pps.c | 1 + 6 files changed, 1846 insertions(+), 1799 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +0
-10@@ -9,24 +9,16 @@#include "i915_irq.h" #include "intel_cdclk.h" #include "intel_combo_phy.h" -#include "intel_combo_phy_regs.h" -#include "intel_crt.h" #include "intel_de.h" #include "intel_display_power.h" #include "intel_display_power_well.h" #include "intel_display_types.h" #include "intel_dmc.h" -#include "intel_dpio_phy.h" -#include "intel_dpll.h" -#include "intel_hotplug.h" #include "intel_mchbar_regs.h" #include "intel_pch_refclk.h" #include "intel_pcode.h" #include "intel_pm.h" -#include "intel_pps.h" #include "intel_snps_phy.h" -#include "intel_tc.h" -#include "intel_vga.h" #include "vlv_sideband.h" const char *@@ -235,604 +227,6 @@ bool intel_display_power_is_enabled(structdrm_i915_private *dev_priv, return ret; } -/* -* Starting with Haswell, we have a "Power Down Well" that can be turned off
- * when not needed anymore. We have 4 registers that can request the power well
- * to be enabled, and it will only be disabled if none of the registers is
- * requesting it to be enabled.
- */
-static void hsw_power_well_post_enable(structdrm_i915_private*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-7- u8 irq_pipe_mask, bool has_vga) -{ - if (has_vga) - intel_vga_reset_io_mem(dev_priv); - - if (irq_pipe_mask) - gen8_irq_power_well_post_enable(dev_priv,
irq_pipe_mask);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-} - -static void hsw_power_well_pre_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-4- u8 irq_pipe_mask) -{ -if (irq_pipe_mask) - gen8_irq_power_well_pre_disable(dev_priv,
irq_pipe_mask);drivers/gpu/drm/i915/display/intel_display_power.c +0
-9-} - -#define ICL_AUX_PW_TO_CH (pw_idx) \ - ((pw_idx) - ICL_PW_CTL_IDX_AUX_A + AUX_CH_A) - -#define ICL_TBT_AUX_PW_TO_CH (pw_idx) \ - ((pw_idx) - ICL_PW_CTL_IDX_AUX_TBT1 + AUX_CH_C) - -static enum aux_ch icl_aux_pw_to_ch(const struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-{ -int pw_idx = power_well->desc->hsw.idx; - - return power_well->desc->hsw.is_tc_tbt ?
ICL_TBT_AUX_PW_TO_CH(pw_idx):drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- ICL_AUX_PW_TO_CH(pw_idx);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-31-} - -static struct intel_digital_port * -aux_ch_to_digital_port (struct drm_i915_private *dev_priv, -enum aux_ch aux_ch) -{ -struct intel_digital_port *dig_port =NULL ; -struct intel_encoder *encoder; - -for_each_intel_encoder (&dev_priv->drm, encoder) { -/* We'll check the MST primary port */ -if (encoder->type ==INTEL_OUTPUT_DP_MST ) -continue ; - - dig_port =enc_to_dig_port (encoder); -if (!dig_port) -continue ; - -if (dig_port->aux_ch != aux_ch) { - dig_port =NULL ; -continue ; - } - -break ; - } - -return dig_port; -} - -static enum phy icl_aux_pw_to_phy (struct drm_i915_private *i915, - const struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-{ -enum aux_ch aux_ch =icl_aux_pw_to_ch (power_well); - struct intel_digital_port *dig_port =
aux_ch_to_digital_port(i915, aux_ch);drivers/gpu/drm/i915/display/intel_display_power.c +0
-5- -return intel_port_to_phy (i915, dig_port->base.port); -} - -static void hsw_wait_for_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well,drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- bool timeout_expected) -{ - const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-int pw_idx = power_well->desc->hsw.idx; -int enable_delay = power_well->desc->hsw.fixed_enable_delay; - -/* -* For some power wells we're not supposed to watch the status bit for
drivers/gpu/drm/i915/display/intel_display_power.c +0
-9-* an ack, but rather just wait a fixed amount of time and then -* proceed. This is only used on DG2. -*/ -if (IS_DG2 (dev_priv) && enable_delay) { -usleep_range (enable_delay,2 * enable_delay); -return ; - } - -/* Timeout for PW1:10 us, AUX:not specified, other PWs:20 us. */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-if (intel_de_wait_for_set (dev_priv, regs->driver, -HSW_PWR_WELL_CTL_STATE (pw_idx),1 )) { - drm_dbg_kms(&dev_priv->drm, "%s power well enabletimeout\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-8- intel_power_well_name(power_well)); - -drm_WARN_ON (&dev_priv->drm, !timeout_expected); - - } -} - -static u32 hsw_power_well_requesters(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- const struct i915_power_well_regs*regs,
drivers/gpu/drm/i915/display/intel_display_power.c +0
-7- int pw_idx) -{ -u32 req_mask =HSW_PWR_WELL_CTL_REQ (pw_idx); -u32 ret; - - ret =intel_de_read (dev_priv, regs->bios) & req_mask ?1 :0 ; - ret |= intel_de_read(dev_priv, regs->driver) & req_mask ? 2 :0;
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-if (regs->kvmr.reg) - ret |= intel_de_read(dev_priv, regs->kvmr) & req_mask ?4 : 0;
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- ret |=intel_de_read (dev_priv, regs->debug) & req_mask ?8 :0 ; - -return ret; -} - -static void hsw_wait_for_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-{ - const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-int pw_idx = power_well->desc->hsw.idx; -bool disabled; -u32 reqs; - -/* -* Bspec doesn't require waiting for PWs to get disabled, but still do
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* this for paranoia. The known cases where a PW will be forced on:
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* - a KVMR request on any power well via the KVMR request register
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* - a DMC request on PW1 and MISC_IO power wells via the BIOS and
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-* DEBUG request registers -* Skip the wait in case any of the request bits are set and print a
drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-* diagnostic message. -*/ - wait_for((disabled = !(intel_de_read(dev_priv, regs->driver) & - HSW_PWR_WELL_CTL_STATE(pw_idx))) || - (reqs = hsw_power_well_requesters(dev_priv, regs,
pw_idx)), 1);drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-if (disabled) -return ; - - drm_dbg_kms(&dev_priv->drm, - "%s forced on (bios:%d driver:%d kvmr:%ddebug:%d)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-intel_power_well_name (power_well), - !!(reqs & 1), !!(reqs & 2), !!(reqs & 4), !!(reqs &8));
drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-} - -static void gen9_wait_for_power_well_fuses(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- enum skl_power_gate pg) -{ -/* Timeout 5us for PG#0, for other PGs 1us */ - drm_WARN_ON(&dev_priv->drm, - intel_de_wait_for_set(dev_priv, SKL_FUSE_STATUS, - SKL_FUSE_PG_DIST_STATUS(pg),1));
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-} - -static void hsw_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ - const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-7-int pw_idx = power_well->desc->hsw.idx; -u32 val; - -if (power_well->desc->hsw.has_fuses) { -enum skl_power_gate pg; - - pg = DISPLAY_VER(dev_priv) >= 11 ?
ICL_PW_CTL_IDX_TO_PG(pw_idx):drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- SKL_PW_CTL_IDX_TO_PG(p
w_idx);drivers/gpu/drm/i915/display/intel_display_power.c +0
-4- -/* Wa_16013190616:adlp */ -if (IS_ALDERLAKE_P (dev_priv) && pg ==SKL_PG1 ) - intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0,
DISABLE_FLR_SRC);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- -/* -* For PW1 we have to wait both for the PW0/PG0 fuse state
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* before enabling the power well and PW1/PG1's own fuse
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* state after the enabling. For all other power wells with
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* fuses we only have to wait for that PW/PG's fuse state
drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-* after the enabling. -*/ -if (pg ==SKL_PG1 ) - gen9_wait_for_power_well_fuses(dev_priv,
SKL_PG0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-12- } - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val |HSW_PWR_WELL_CTL_REQ (pw_idx)); - -hsw_wait_for_power_well_enable (dev_priv, power_well, false); - -if (power_well->desc->hsw.has_fuses) { -enum skl_power_gate pg; - - pg = DISPLAY_VER(dev_priv) >= 11 ?
ICL_PW_CTL_IDX_TO_PG(pw_idx):drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- SKL_PW_CTL_IDX_TO_PG(p
w_idx);drivers/gpu/drm/i915/display/intel_display_power.c +0
-9-gen9_wait_for_power_well_fuses (dev_priv, pg); - } - -hsw_power_well_post_enable (dev_priv, - power_well->desc->hsw.irq_pipe_mask, - power_well->desc->hsw.has_vga); -} - -static void hsw_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- struct i915_power_well *power_well) -{ - const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-int pw_idx = power_well->desc->hsw.idx; -u32 val; - - hsw_power_well_pre_disable(dev_priv, - power_well->desc-Quoted 1 line
hsw.irq_pipe_mask);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-9- - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val & ~HSW_PWR_WELL_CTL_REQ (pw_idx)); -hsw_wait_for_power_well_disable (dev_priv, power_well); -} - -static void -icl_combo_phy_aux_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- struct i915_power_well *power_well) -{ - const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-20-int pw_idx = power_well->desc->hsw.idx; -enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); -u32 val; - -drm_WARN_ON (&dev_priv->drm, !IS_ICELAKE (dev_priv)); - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val |HSW_PWR_WELL_CTL_REQ (pw_idx)); - -if (DISPLAY_VER (dev_priv) <12 ) { - val =intel_de_read (dev_priv,ICL_PORT_CL_DW12 (phy)); -intel_de_write (dev_priv,ICL_PORT_CL_DW12 (phy), - val |ICL_LANE_ENABLE_AUX ); - } - -hsw_wait_for_power_well_enable (dev_priv, power_well, false); - -/* Display WA #1178: icl */ - if (pw_idx >= ICL_PW_CTL_IDX_AUX_A && pw_idx <=
ICL_PW_CTL_IDX_AUX_B&&drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- !intel_bios_is_port_edp(dev_priv, (enum port)phy)) { - val = intel_de_read(dev_priv,
ICL_AUX_ANAOVRD1(pw_idx));drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- val |= ICL_AUX_ANAOVRD1_ENABLE |
ICL_AUX_ANAOVRD1_LDO_BYPASS;drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- intel_de_write(dev_priv, ICL_AUX_ANAOVRD1(pw_idx),val);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-5- } -} - -static void -icl_combo_phy_aux_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-{ - const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-20-int pw_idx = power_well->desc->hsw.idx; -enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); -u32 val; - -drm_WARN_ON (&dev_priv->drm, !IS_ICELAKE (dev_priv)); - - val =intel_de_read (dev_priv,ICL_PORT_CL_DW12 (phy)); -intel_de_write (dev_priv,ICL_PORT_CL_DW12 (phy), - val & ~ICL_LANE_ENABLE_AUX ); - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val & ~HSW_PWR_WELL_CTL_REQ (pw_idx)); - -hsw_wait_for_power_well_disable (dev_priv, power_well); -} - -#if IS_ENABLED (CONFIG_DRM_I915_DEBUG_RUNTIME_PM ) - -static void icl_tc_port_assert_ref_held(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct intel_digital_port
*dig_port)drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-{ -if (drm_WARN_ON (&dev_priv->drm, !dig_port)) -return ; - - if (DISPLAY_VER(dev_priv) == 11 &&
intel_tc_cold_requires_aux_pw(dig_port))drivers/gpu/drm/i915/display/intel_display_power.c +0
-8-return ; - -drm_WARN_ON (&dev_priv->drm, !intel_tc_port_ref_held (dig_port)); -} - -#else - -static void icl_tc_port_assert_ref_held(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct intel_digital_port
*dig_port)drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-{ -} - -#endif - -#define TGL_AUX_PW_TO_TC_PORT (pw_idx) ((pw_idx) -
TGL_PW_CTL_IDX_AUX_TC1)drivers/gpu/drm/i915/display/intel_display_power.c +0
-7- -static void icl_tc_cold_exit (struct drm_i915_private *i915) -{ -int ret, tries =0 ; - -while (1 ) { - ret = snb_pcode_write_timeout(i915,
ICL_PCODE_EXIT_TCCOLD, 0,drivers/gpu/drm/i915/display/intel_display_power.c +0
-7- 250, 1); -if (ret != -EAGAIN || ++tries ==3 ) -break ; -msleep (1 ); - } - -/* Spec states that TC cold exit can take up to 1ms to complete */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-if (!ret) -msleep (1 ); - -/* TODO: turn failure into a error as soon i915 CI updates ICL IFWI */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-10-drm_dbg_kms (&i915->drm,"TC cold block %s\n" , ret ?"failed" : -"succeeded" ); -} - -static void -icl_tc_phy_aux_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -enum aux_ch aux_ch =icl_aux_pw_to_ch (power_well); - struct intel_digital_port *dig_port =
aux_ch_to_digital_port(dev_priv, aux_ch);drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-15-bool is_tbt = power_well->desc->hsw.is_tc_tbt; -bool timeout_expected; -u32 val; - -icl_tc_port_assert_ref_held (dev_priv, power_well, dig_port); - - val =intel_de_read (dev_priv,DP_AUX_CH_CTL (aux_ch)); - val &= ~DP_AUX_CH_CTL_TBT_IO ; -if (is_tbt) - val |=DP_AUX_CH_CTL_TBT_IO ; -intel_de_write (dev_priv,DP_AUX_CH_CTL (aux_ch), val); - - val =intel_de_read (dev_priv, regs->driver); -intel_de_write (dev_priv, regs->driver, - val | HSW_PWR_WELL_CTL_REQ(power_well->desc-Quoted 1 line
hsw.idx));
drivers/gpu/drm/i915/display/intel_display_power.c +0
-4- -/* -* An AUX timeout is expected if the TBT DP tunnel is down, -* or need to enable AUX on a legacy TypeC port as part of the TC-cold
drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-* exit sequence. -*/ - timeout_expected = is_tbt ||
intel_tc_cold_requires_aux_pw(dig_port);drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- if (DISPLAY_VER(dev_priv) == 11 &&
intel_tc_cold_requires_aux_pw(dig_port))drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-icl_tc_cold_exit (dev_priv); - - hsw_wait_for_power_well_enable(dev_priv, power_well,
timeout_expected);drivers/gpu/drm/i915/display/intel_display_power.c +0
-5- -if (DISPLAY_VER (dev_priv) >=12 && !is_tbt) { -enum tc_port tc_port; - - tc_port = TGL_AUX_PW_TO_TC_PORT(power_well->desc-Quoted 1 line
hsw.idx);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), -HIP_INDEX_VAL (tc_port,0x2 )); - - if (intel_de_wait_for_set(dev_priv,
DKL_CMN_UC_DW_27(tc_port),drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- DKL_CMN_UC_DW27_UC_HEALTH,1))
drivers/gpu/drm/i915/display/intel_display_power.c +0
-13-drm_warn (&dev_priv->drm, -"Timeout waiting TC uC health\n" ); - } -} - -static void -icl_aux_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); - -if (intel_phy_is_tc (dev_priv, phy)) - return icl_tc_phy_aux_power_well_enable(dev_priv,
power_well);drivers/gpu/drm/i915/display/intel_display_power.c +0
-18-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) -{ -enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); - -if (intel_phy_is_tc (dev_priv, phy)) -return hsw_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 +0
-6-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
- * be enabled.
- */
-static bool hsw_power_well_enabled(structdrm_i915_private*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- struct i915_power_well *power_well) -{ - const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-10-enum i915_power_well_id id = power_well->desc->id; -int pw_idx = power_well->desc->hsw.idx; -u32 mask =HSW_PWR_WELL_CTL_REQ (pw_idx) | -HSW_PWR_WELL_CTL_STATE (pw_idx); -u32 val; - - val =intel_de_read (dev_priv, regs->driver); - -/* -* On GEN9 big core due to a DMC bug the driver's request bits for PW1
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* and the MISC_IO PW will be not restored, so check instead for the
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* BIOS's own request bits, which are forced-on for these power wells
drivers/gpu/drm/i915/display/intel_display_power.c +0
-13-* when exiting DC5/6. -*/ -if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv) && - (id ==SKL_DISP_PW_1 || id ==SKL_DISP_PW_MISC_IO )) - val |=intel_de_read (dev_priv, regs->bios); - -return (val & mask) == mask; -} - -static void assert_can_enable_dc9 (struct drm_i915_private *dev_priv) -{ - drm_WARN_ONCE(&dev_priv->drm, - (intel_de_read(dev_priv, DC_STATE_EN) &
DC_STATE_EN_DC9),drivers/gpu/drm/i915/display/intel_display_power.c +0
-14- "DC9 already programmed to be enabled.\n"); -drm_WARN_ONCE (&dev_priv->drm, -intel_de_read (dev_priv,DC_STATE_EN ) & -DC_STATE_EN_UPTO_DC5 , -"DC5 still not disabled to enable DC9.\n" ); -drm_WARN_ONCE (&dev_priv->drm, -intel_de_read (dev_priv,HSW_PWR_WELL_CTL2 ) & -HSW_PWR_WELL_CTL_REQ (SKL_PW_CTL_IDX_PW_2 ), -"Power well 2 on.\n" ); -drm_WARN_ONCE (&dev_priv->drm,intel_irqs_enabled (dev_priv), -"Interrupts not disabled yet.\n" ); - -/* -* TODO: check for the following to verify the conditions to enter DC9
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-* state are satisfied: -* 1] Check relevant display engine registers to verify if mode set
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-* disable sequence was followed. -* 2] Check if display uninitialize sequence is initialized. -*/ -} - -static void assert_can_disable_dc9(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power.c +0
-10-{ -drm_WARN_ONCE (&dev_priv->drm,intel_irqs_enabled (dev_priv), -"Interrupts not disabled yet.\n" ); -drm_WARN_ONCE (&dev_priv->drm, -intel_de_read (dev_priv,DC_STATE_EN ) & -DC_STATE_EN_UPTO_DC5 , -"DC5 still not disabled.\n" ); - -/* -* TODO: check for the following to verify DC9 state was indeed
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-* entered before programming to disable it: -* 1] Check relevant display engine registers to verify if mode
drivers/gpu/drm/i915/display/intel_display_power.c +0
-17-* set disable sequence was followed. -* 2] Check if display uninitialize sequence is initialized. -*/ -} - -static void gen9_write_dc_state (struct drm_i915_private *dev_priv, -u32 state) -{ -int rewrites =0 ; -int rereads =0 ; -u32 v; - -intel_de_write (dev_priv,DC_STATE_EN , state); - -/* It has been observed that disabling the dc6 state sometimes -* doesn't stick and dmc keeps returning old value. Make sure -* the write really sticks enough times and also force rewrite until
drivers/gpu/drm/i915/display/intel_display_power.c +0
-47-* we are confident that state is exactly what we want. -*/ -do { - v =intel_de_read (dev_priv,DC_STATE_EN ); - -if (v != state) { -intel_de_write (dev_priv,DC_STATE_EN , state); - rewrites++; - rereads =0 ; - }else if (rereads++ >5 ) { -break ; - } - - }while (rewrites <100 ); - -if (v != state) -drm_err (&dev_priv->drm, -"Writing dc state to 0x%x failed, now 0x%x\n" , - state, v); - -/* Most of the times we need one retry, avoid spam */ -if (rewrites >1 ) -drm_dbg_kms (&dev_priv->drm, -"Rewrote dc state to 0x%x %d times\n" , - state, rewrites); -} - -static u32 gen9_dc_mask (struct drm_i915_private *dev_priv) -{ -u32 mask; - - mask =DC_STATE_EN_UPTO_DC5 ; - -if (DISPLAY_VER (dev_priv) >=12 ) - mask |=DC_STATE_EN_DC3CO |DC_STATE_EN_UPTO_DC6 - |DC_STATE_EN_DC9 ; -else if (DISPLAY_VER (dev_priv) ==11 ) - mask |=DC_STATE_EN_UPTO_DC6 |DC_STATE_EN_DC9 ; -else if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) - mask |=DC_STATE_EN_DC9 ; -else - mask |=DC_STATE_EN_UPTO_DC6 ; - -return mask; -} - -static void gen9_sanitize_dc_state(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power.c +0
-7-{ -u32 val; - -if (!HAS_DISPLAY (dev_priv)) -return ; - - val = intel_de_read(dev_priv, DC_STATE_EN) &
gen9_dc_mask(dev_priv);drivers/gpu/drm/i915/display/intel_display_power.c +0
-17- -drm_dbg_kms (&dev_priv->drm, -"Resetting DC state tracking from %02x to %02x\n" , - dev_priv->dmc.dc_state, val); - dev_priv->dmc.dc_state = val; -} - -/** -* gen9_set_dc_state - set target display C power state -* @dev_priv: i915 device instance -* @state: target DC power state -* - DC_STATE_DISABLE -* - DC_STATE_EN_UPTO_DC5 -* - DC_STATE_EN_UPTO_DC6 -* - DC_STATE_EN_DC9 -* -* Signal to DMC firmware/HW the target DC power state passed in @state.
- * DMC/HW can turn off individual display clocks and power rails when entering
- * a deeper DC power state (higher in number) and turns these back when exiting
- * that state to a shallower power state (lower in number). The HW will decide
- * when to actually enter a given state on an on-demand basis, for instance
- * depending on the active state of display pipes. The state of display
- * registers backed by affected power rails are saved/restored as needed.
- *
- * Based on the above enabling a deeper DC power state is asynchronous wrt.
- * enabling it. Disabling a deeper power state is synchronous: for instance
- * setting %DC_STATE_DISABLE won't complete until all HW resources are turned
- * back on and register state is restored. This is guaranteed by the MMIO write
- * toDC_STATE_ENblocking until the state is restored.
- */
-static voidgen9_set_dc_state(struct drm_i915_private *dev_priv, u32 state)drivers/gpu/drm/i915/display/intel_display_power.c +0
-14-{ -u32 val; -u32 mask; - -if (!HAS_DISPLAY (dev_priv)) -return ; - -if (drm_WARN_ON_ONCE (&dev_priv->drm, - state & ~dev_priv->dmc.allowed_dc_mask)) - state &= dev_priv->dmc.allowed_dc_mask; - - val =intel_de_read (dev_priv,DC_STATE_EN ); - mask =gen9_dc_mask (dev_priv); - drm_dbg_kms(&dev_priv->drm, "Setting DC state from %02x to%02x\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-5- val & mask, state); - -/* Check if DMC is ignoring our DC state requests */ -if ((val & mask) != dev_priv->dmc.dc_state) - drm_err(&dev_priv->drm, "DC state mismatch (0x%x ->0x%x)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-64- dev_priv->dmc.dc_state, val & mask); - - val &= ~mask; - val |= state; - -gen9_write_dc_state (dev_priv, val); - - dev_priv->dmc.dc_state = val & mask; -} -static u32 sanitize_target_dc_state (struct drm_i915_private *dev_priv,u32 target_dc_state)@@ -858,65 +252,6 @@ sanitize_target_dc_state(struct drm_i915_private *dev_priv, return target_dc_state; } -static void tgl_enable_dc3co (struct drm_i915_private *dev_priv) -{ -drm_dbg_kms (&dev_priv->drm,"Enabling DC3CO\n" ); -gen9_set_dc_state (dev_priv,DC_STATE_EN_DC3CO ); -} - -static void tgl_disable_dc3co (struct drm_i915_private *dev_priv) -{ -u32 val; - -drm_dbg_kms (&dev_priv->drm,"Disabling DC3CO\n" ); - val =intel_de_read (dev_priv,DC_STATE_EN ); - val &= ~DC_STATE_DC3CO_STATUS ; -intel_de_write (dev_priv,DC_STATE_EN , val); -gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); -/* -* Delay of 200us DC3CO Exit time B.Spec 49196 -*/ -usleep_range (200 ,210 ); -} - -static void bxt_enable_dc9 (struct drm_i915_private *dev_priv) -{ -assert_can_enable_dc9 (dev_priv); - -drm_dbg_kms (&dev_priv->drm,"Enabling DC9\n" ); -/* -* Power sequencer reset is not needed on -* platforms with South Display Engine on PCH, -* because PPS registers are always on. -*/ -if (!HAS_PCH_SPLIT (dev_priv)) -intel_pps_reset_all (dev_priv); -gen9_set_dc_state (dev_priv,DC_STATE_EN_DC9 ); -} - -static void bxt_disable_dc9 (struct drm_i915_private *dev_priv) -{ -assert_can_disable_dc9 (dev_priv); - -drm_dbg_kms (&dev_priv->drm,"Disabling DC9\n" ); - -gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); - -intel_pps_unlock_regs_wa (dev_priv); -} - -static void assert_dmc_loaded(struct drm_i915_private *dev_priv) -{ - drm_WARN_ONCE(&dev_priv->drm, - !intel_de_read(dev_priv, - DMC_PROGRAM(dev_priv- >dmc.dmc_info[DMC_FW_MAIN].start_mmioaddr, 0)), - "DMC program storage start is NULL\n"); - drm_WARN_ONCE(&dev_priv->drm, !intel_de_read(dev_priv,
DMC_SSP_BASE),drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- "DMC SSP Base Not fine\n"); - drm_WARN_ONCE(&dev_priv->drm, !intel_de_read(dev_priv,
DMC_HTP_SKL),drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- "DMC HTP Not fine\n"); -} -/** * intel_display_power_set_target_dc_state - Set target dc state. * @dev_priv: i915 device @@ -961,912 +296,8 @@ voidintel_display_power_set_target_dc_state(struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-5mutex_unlock (&power_domains->lock); } -static void assert_can_enable_dc5 (struct drm_i915_private *dev_priv) -{ -enum i915_power_well_id high_pg; - -/* Power wells at this level and above must be disabled for DC5 entry */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-7-if (DISPLAY_VER (dev_priv) ==12 ) - high_pg =ICL_DISP_PW_3 ; -else - high_pg =SKL_DISP_PW_2 ; - - drm_WARN_ONCE(&dev_priv->drm, - intel_display_power_well_is_enabled(dev_priv,
high_pg),drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- "Power wells above platform's DC5 limit stillenabled.\n");
drivers/gpu/drm/i915/display/intel_display_power.c +0
-20- -drm_WARN_ONCE (&dev_priv->drm, - (intel_de_read (dev_priv,DC_STATE_EN ) & -DC_STATE_EN_UPTO_DC5 ), -"DC5 already programmed to be enabled.\n" ); -assert_rpm_wakelock_held (&dev_priv->runtime_pm); - -assert_dmc_loaded (dev_priv); -} - -static void gen9_enable_dc5 (struct drm_i915_private *dev_priv) -{ -assert_can_enable_dc5 (dev_priv); - -drm_dbg_kms (&dev_priv->drm,"Enabling DC5\n" ); - -/* Wa Display #1183: skl,kbl,cfl */ -if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv)) - intel_de_write(dev_priv, GEN8_CHICKEN_DCPR_1, - intel_de_read(dev_priv,
GEN8_CHICKEN_DCPR_1) |SKL_SELECT_ALTERNATE_DC_EXIT);drivers/gpu/drm/i915/display/intel_display_power.c +0
-8- -gen9_set_dc_state (dev_priv,DC_STATE_EN_UPTO_DC5 ); -} - -static void assert_can_enable_dc6 (struct drm_i915_private *dev_priv) -{ - drm_WARN_ONCE(&dev_priv->drm, - intel_de_read(dev_priv, UTIL_PIN_CTL) &
UTIL_PIN_ENABLE,drivers/gpu/drm/i915/display/intel_display_power.c +0
-19- "Backlight is not disabled.\n"); -drm_WARN_ONCE (&dev_priv->drm, - (intel_de_read (dev_priv,DC_STATE_EN ) & -DC_STATE_EN_UPTO_DC6 ), -"DC6 already programmed to be enabled.\n" ); - -assert_dmc_loaded (dev_priv); -} - -static void skl_enable_dc6 (struct drm_i915_private *dev_priv) -{ -assert_can_enable_dc6 (dev_priv); - -drm_dbg_kms (&dev_priv->drm,"Enabling DC6\n" ); - -/* Wa Display #1183: skl,kbl,cfl */ -if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv)) - intel_de_write(dev_priv, GEN8_CHICKEN_DCPR_1, - intel_de_read(dev_priv,
GEN8_CHICKEN_DCPR_1) |SKL_SELECT_ALTERNATE_DC_EXIT);drivers/gpu/drm/i915/display/intel_display_power.c +0
-5- -gen9_set_dc_state (dev_priv,DC_STATE_EN_UPTO_DC6 ); -} - -static void hsw_power_well_sync_hw(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- struct i915_power_well *power_well) -{ - const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power.c +0
-10-int pw_idx = power_well->desc->hsw.idx; -u32 mask =HSW_PWR_WELL_CTL_REQ (pw_idx); -u32 bios_req =intel_de_read (dev_priv, regs->bios); - -/* Take over the request bit if set by BIOS. */ -if (bios_req & mask) { -u32 drv_req =intel_de_read (dev_priv, regs->driver); - -if (!(drv_req & mask)) - intel_de_write(dev_priv, regs->driver, drv_req| mask);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-intel_de_write (dev_priv, regs->bios, bios_req & ~mask); - } -} - -static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-{ -bxt_ddi_phy_init (dev_priv, power_well->desc->bxt.phy); -} - -static void bxt_dpio_cmn_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-{ -bxt_ddi_phy_uninit (dev_priv, power_well->desc->bxt.phy); -} - -static bool bxt_dpio_cmn_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-{ - return bxt_ddi_phy_is_enabled(dev_priv, power_well->desc-Quoted 1 line
bxt.phy);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-} - -static void bxt_verify_ddi_phy_power_wells(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-{ -struct i915_power_well *power_well; - - power_well = lookup_power_well(dev_priv,
BXT_DISP_PW_DPIO_CMN_A);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-if (intel_power_well_refcount (power_well) >0 ) - bxt_ddi_phy_verify_state(dev_priv, power_well->desc-Quoted 1 line
bxt.phy);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- - power_well = lookup_power_well(dev_priv,
VLV_DISP_PW_DPIO_CMN_BC);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-if (intel_power_well_refcount (power_well) >0 ) - bxt_ddi_phy_verify_state(dev_priv, power_well->desc-Quoted 1 line
bxt.phy);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-7- -if (IS_GEMINILAKE (dev_priv)) { - power_well =lookup_power_well (dev_priv, -GLK_DISP_PW_DPIO_CMN_C ); -if (intel_power_well_refcount (power_well) >0 ) - bxt_ddi_phy_verify_state(dev_priv, - power_well->desc-Quoted 1 line
bxt.phy);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-4- } -} - -static bool gen9_dc_off_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-{ - return ((intel_de_read(dev_priv, DC_STATE_EN) &
DC_STATE_EN_DC3CO) == 0 &&drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- (intel_de_read(dev_priv, DC_STATE_EN) &
DC_STATE_EN_UPTO_DC5_DC6_MASK) == 0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-} - -static void gen9_assert_dbuf_enabled(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-{ - u8 hw_enabled_dbuf_slices =
intel_enabled_dbuf_slices_mask(dev_priv);drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-u8 enabled_dbuf_slices = dev_priv->dbuf.enabled_slices; - - drm_WARN(&dev_priv->drm, - hw_enabled_dbuf_slices != enabled_dbuf_slices, - "Unexpected DBuf power power state (0x%08x, expected0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-5- hw_enabled_dbuf_slices, - enabled_dbuf_slices); -} - -static void gen9_disable_dc_states(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power.c +0
-15-{ -struct intel_cdclk_config cdclk_config = {}; - -if (dev_priv->dmc.target_dc_state ==DC_STATE_EN_DC3CO ) { -tgl_disable_dc3co (dev_priv); -return ; - } - -gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); - -if (!HAS_DISPLAY (dev_priv)) -return ; - -intel_cdclk_get_cdclk (dev_priv, &cdclk_config); -/* Can't read out voltage_level so can't use
intel_cdclk_changed()*/drivers/gpu/drm/i915/display/intel_display_power.c +0
-12-drm_WARN_ON (&dev_priv->drm, -intel_cdclk_needs_modeset (&dev_priv->cdclk.hw, - &cdclk_config)); - -gen9_assert_dbuf_enabled (dev_priv); - -if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) -bxt_verify_ddi_phy_power_wells (dev_priv); - -if (DISPLAY_VER (dev_priv) >=11 ) -/* -* DMC retains HW context only for port A, the other combo
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* PHY's HW context for port B is lost after DC transitions,
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-* so we need to restore it manually. -*/ -intel_combo_phy_init (dev_priv); -} - -static void gen9_dc_off_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-{ -gen9_disable_dc_states (dev_priv); -} - -static void gen9_dc_off_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-18-{ -if (!intel_dmc_has_payload (dev_priv)) -return ; - -switch (dev_priv->dmc.target_dc_state) { -case DC_STATE_EN_DC3CO : -tgl_enable_dc3co (dev_priv); -break ; -case DC_STATE_EN_UPTO_DC6 : -skl_enable_dc6 (dev_priv); -break ; -case DC_STATE_EN_UPTO_DC5 : -gen9_enable_dc5 (dev_priv); -break ; - } -} - -static void i9xx_power_well_sync_hw_noop(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-{ -} - -static void i9xx_always_on_power_well_noop(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-{ -} - -static bool i9xx_always_on_power_well_enabled(struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-{ -return true; -} - -static void i830_pipes_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-{ - if ((intel_de_read(dev_priv, PIPECONF(PIPE_A)) &
PIPECONF_ENABLE) == 0)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-i830_enable_pipe (dev_priv,PIPE_A ); - if ((intel_de_read(dev_priv, PIPECONF(PIPE_B)) &
PIPECONF_ENABLE) == 0)drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-i830_enable_pipe (dev_priv,PIPE_B ); -} - -static void i830_pipes_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-{ -i830_disable_pipe (dev_priv,PIPE_B ); -i830_disable_pipe (dev_priv,PIPE_A ); -} - -static bool i830_pipes_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-{ - return intel_de_read(dev_priv, PIPECONF(PIPE_A)) &
PIPECONF_ENABLE&&drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- intel_de_read(dev_priv, PIPECONF(PIPE_B)) &
PIPECONF_ENABLE;drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-} - -static void i830_pipes_power_well_sync_hw(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-9-{ -if (intel_power_well_refcount (power_well) >0 ) -i830_pipes_power_well_enable (dev_priv, power_well); -else -i830_pipes_power_well_disable (dev_priv, power_well); -} - -static void vlv_set_power_well (struct drm_i915_private *dev_priv, - struct i915_power_well *power_well, boolenable)
drivers/gpu/drm/i915/display/intel_display_power.c +0
-14-{ -int pw_idx = power_well->desc->vlv.idx; -u32 mask; -u32 state; -u32 ctrl; - - mask =PUNIT_PWRGT_MASK (pw_idx); - state = enable ?PUNIT_PWRGT_PWR_ON (pw_idx) : -PUNIT_PWRGT_PWR_GATE (pw_idx); - -vlv_punit_get (dev_priv); - -#define COND \ - ((vlv_punit_read(dev_priv, PUNIT_REG_PWRGT_STATUS) & mask) ==state)
drivers/gpu/drm/i915/display/intel_display_power.c +0
-12- -if (COND ) - goto out; - - ctrl =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL ); - ctrl &= ~mask; - ctrl |= state; -vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL , ctrl); - -if (wait_for (COND ,100 )) - drm_err(&dev_priv->drm, - "timeout setting power well state %08x(%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- state, - vlv_punit_read(dev_priv,
PUNIT_REG_PWRGT_CTRL));drivers/gpu/drm/i915/display/intel_display_power.c +0
-14- -#undef COND - -out: -vlv_punit_put (dev_priv); -} - -static void vlv_power_well_enable (struct drm_i915_private *dev_priv, -struct i915_power_well *power_well) -{ -vlv_set_power_well (dev_priv, power_well, true); -} - -static void vlv_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- struct i915_power_well *power_well) -{ -vlv_set_power_well (dev_priv, power_well, false); -} - -static bool vlv_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-14- struct i915_power_well *power_well) -{ -int pw_idx = power_well->desc->vlv.idx; -bool enabled = false; -u32 mask; -u32 state; -u32 ctrl; - - mask =PUNIT_PWRGT_MASK (pw_idx); - ctrl =PUNIT_PWRGT_PWR_ON (pw_idx); - -vlv_punit_get (dev_priv); - - state = vlv_punit_read(dev_priv, PUNIT_REG_PWRGT_STATUS) &mask;
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-/* -* We only ever set the power-on and power-gate states, anything
drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-* else is unexpected. -*/ - drm_WARN_ON(&dev_priv->drm, state != PUNIT_PWRGT_PWR_ON(pw_idx)&&
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- state != PUNIT_PWRGT_PWR_GATE(pw_idx)); -if (state == ctrl) - enabled = true; - -/* -* A transient state at this point would mean some unexpected party
drivers/gpu/drm/i915/display/intel_display_power.c +0
-11-* is poking at the power controls too. -*/ - ctrl =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL ) & mask; -drm_WARN_ON (&dev_priv->drm, ctrl != state); - -vlv_punit_put (dev_priv); - -return enabled; -} - -static void vlv_init_display_clock_gating(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-{ -u32 val; - -/* -* On driver load, a pipe may be active and driving a DSI display.
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* Preserve DPOUNIT_CLOCK_GATE_DISABLE to avoid the pipe getting stuck
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* (and never recovering) in this case.
intel_dsi_post_disable()willdrivers/gpu/drm/i915/display/intel_display_power.c +0
-15-* clear it when we turn off the display. -*/ - val =intel_de_read (dev_priv,DSPCLK_GATE_D ); - val &=DPOUNIT_CLOCK_GATE_DISABLE ; - val |=VRHUNIT_CLOCK_GATE_DISABLE ; -intel_de_write (dev_priv,DSPCLK_GATE_D , val); - -/* -* Disable trickle feed and enable pnd deadline calculation -*/ -intel_de_write (dev_priv,MI_ARB_VLV , -MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE ); -intel_de_write (dev_priv,CBR1_VLV ,0 ); - - drm_WARN_ON(&dev_priv->drm, RUNTIME_INFO(dev_priv)->rawclk_freq== 0);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- intel_de_write(dev_priv, RAWCLK_FREQ_VLV, - DIV_ROUND_CLOSEST(RUNTIME_INFO(dev_priv)-Quoted 1 line
rawclk_freq,drivers/gpu/drm/i915/display/intel_display_power.c +0
-4- 1000)); -} - -static void vlv_display_power_well_init(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power.c +0
-30-{ -struct intel_encoder *encoder; -enum pipe pipe; - -/* -* Enable the CRI clock source so we can get at the -* display and the reference clock for VGA -* hotplug / manual detection. Supposedly DSI also -* needs the ref clock up and running. -* -* CHV DPLL B/C have some issues if VGA mode is enabled. -*/ -for_each_pipe (dev_priv, pipe) { -u32 val =intel_de_read (dev_priv,DPLL (pipe)); - - val |=DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; -if (pipe !=PIPE_A ) - val |=DPLL_INTEGRATED_CRI_CLK_VLV ; - -intel_de_write (dev_priv,DPLL (pipe), val); - } - -vlv_init_display_clock_gating (dev_priv); - -spin_lock_irq (&dev_priv->irq_lock); -valleyview_enable_display_irqs (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); - -/* -* During driver initialization/resume we can avoid restoring the
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* part of the HW/SW state that will be inited anyway explicitly.
drivers/gpu/drm/i915/display/intel_display_power.c +0
-19-*/ -if (dev_priv->power_domains.initializing) -return ; - -intel_hpd_init (dev_priv); -intel_hpd_poll_disable (dev_priv); - -/* Re-enable the ADPA, if we have one */ -for_each_intel_encoder (&dev_priv->drm, encoder) { -if (encoder->type ==INTEL_OUTPUT_ANALOG ) -intel_crt_reset (&encoder->base); - } - -intel_vga_redisable_power_on (dev_priv); - -intel_pps_unlock_regs_wa (dev_priv); -} - -static void vlv_display_power_well_deinit(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power.c +0
-11-{ -spin_lock_irq (&dev_priv->irq_lock); -valleyview_disable_display_irqs (dev_priv); -spin_unlock_irq (&dev_priv->irq_lock); - -/* make sure we're done processing display irqs */ -intel_synchronize_irq (dev_priv); - -intel_pps_reset_all (dev_priv); - -/* Prevent us from re-enabling polling on accident in late suspend */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-if (!dev_priv->drm.dev->power.is_suspended) -intel_hpd_poll_enable (dev_priv); -} - -static void vlv_display_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-7-{ -vlv_set_power_well (dev_priv, power_well, true); - -vlv_display_power_well_init (dev_priv); -} - -static void vlv_display_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-7-{ -vlv_display_power_well_deinit (dev_priv); - -vlv_set_power_well (dev_priv, power_well, false); -} - -static void vlv_dpio_cmn_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-19-{ -/* since ref/cri clock was enabled */ -udelay (1 );/* >10ns for cmnreset, >0ns for sidereset */ - -vlv_set_power_well (dev_priv, power_well, true); - -/* -* From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx - -* 6. De-assert cmn_reset/side_reset. Same as VLV X0. -* a. GUnit 0x2110 bit[0] set to 1 (def 0) -* b. The other bits such as sfr settings / modesel may all -* be set to 0. -* -* This should only be done on init and resume from S3 with -* both PLLs disabled, or we risk losing DPIO and PLL -* synchronization. -*/ - intel_de_write(dev_priv, DPIO_CTL, - intel_de_read(dev_priv, DPIO_CTL) |
DPIO_CMNRST);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-} - -static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-9-{ -enum pipe pipe; - -for_each_pipe (dev_priv, pipe) -assert_pll_disabled (dev_priv, pipe); - -/* Assert common reset */ - intel_de_write(dev_priv, DPIO_CTL, - intel_de_read(dev_priv, DPIO_CTL) &~DPIO_CMNRST);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-25- -vlv_set_power_well (dev_priv, power_well, false); -} -#define POWER_DOMAIN_MASK (GENMASK_ULL(POWER_DOMAIN_NUM - 1, 0)) -#define BITS_SET (val, bits) (((val) & (bits)) == (bits)) - -static void assert_chv_phy_status (struct drm_i915_private *dev_priv) -{ -struct i915_power_well *cmn_bc = -lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC ); -struct i915_power_well *cmn_d = -lookup_power_well (dev_priv,CHV_DISP_PW_DPIO_CMN_D ); -u32 phy_control = dev_priv->chv_phy_control; -u32 phy_status =0 ; -u32 phy_status_mask =0xffffffff ; - -/* -* The BIOS can leave the PHY is some weird state -* where it doesn't fully power down some parts. -* Disable the asserts until the PHY has been fully -* reset (ie. the power well has been disabled at -* least once). -*/ -if (!dev_priv->chv_phy_assert[DPIO_PHY0 ]) - phy_status_mask &= ~(PHY_STATUS_CMN_LDO(DPIO_PHY0,
DPIO_CH0) |drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- PHY_STATUS_SPLINE_LDO(DPIO_PHY0,
DPIO_CH0, 0) |drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- PHY_STATUS_SPLINE_LDO(DPIO_PHY0,
DPIO_CH0, 1) |drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- PHY_STATUS_CMN_LDO(DPIO_PHY0,
DPIO_CH1) |drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- PHY_STATUS_SPLINE_LDO(DPIO_PHY0,
DPIO_CH1, 0) |drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- PHY_STATUS_SPLINE_LDO(DPIO_PHY0,
DPIO_CH1, 1));drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- -if (!dev_priv->chv_phy_assert[DPIO_PHY1 ]) - phy_status_mask &= ~(PHY_STATUS_CMN_LDO(DPIO_PHY1,
DPIO_CH0) |drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- PHY_STATUS_SPLINE_LDO(DPIO_PHY1,
DPIO_CH0, 0) |drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- PHY_STATUS_SPLINE_LDO(DPIO_PHY1,
DPIO_CH0, 1));drivers/gpu/drm/i915/display/intel_display_power.c +0
-5- -if (intel_power_well_is_enabled (dev_priv, cmn_bc)) { - phy_status |=PHY_POWERGOOD (DPIO_PHY0 ); - -/* this assumes override is only used to enable lanes */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- if ((phy_control & PHY_CH_POWER_DOWN_OVRD_EN(DPIO_PHY0,
DPIO_CH0)) == 0)drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_control |= PHY_CH_POWER_DOWN_OVRD(0xf,
DPIO_PHY0,DPIO_CH0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- - if ((phy_control & PHY_CH_POWER_DOWN_OVRD_EN(DPIO_PHY0,
DPIO_CH1)) == 0)drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_control |= PHY_CH_POWER_DOWN_OVRD(0xf,
DPIO_PHY0,DPIO_CH1);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- -/* CL1 is on whenever anything is on in either channel */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0xf, DPIO_PHY0,
DPIO_CH0) |drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- PHY_CH_POWER_DOWN_OVRD(0xf, DPIO_PHY0,
DPIO_CH1)))drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_CMN_LDO(DPIO_PHY0,
DPIO_CH0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- -/* -* The DPLLB check accounts for the pipe B + port A usage
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* with CL2 powered up but all the lanes in the second channel
drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-* powered down. -*/ - if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0xf, DPIO_PHY0,
DPIO_CH1)) &&drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- (intel_de_read(dev_priv, DPLL(PIPE_B)) &
DPLL_VCO_ENABLE) == 0)drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_CMN_LDO(DPIO_PHY0,
DPIO_CH1);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- - if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0x3, DPIO_PHY0,
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_SPLINE_LDO(DPIO_PHY0,
DPIO_CH0, 0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0xc, DPIO_PHY0,
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_SPLINE_LDO(DPIO_PHY0,
DPIO_CH0, 1);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- - if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0x3, DPIO_PHY0,
DPIO_CH1)))drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_SPLINE_LDO(DPIO_PHY0,
DPIO_CH1, 0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0xc, DPIO_PHY0,
DPIO_CH1)))drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_SPLINE_LDO(DPIO_PHY0,
DPIO_CH1, 1);drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- } - -if (intel_power_well_is_enabled (dev_priv, cmn_d)) { - phy_status |=PHY_POWERGOOD (DPIO_PHY1 ); - -/* this assumes override is only used to enable lanes */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- if ((phy_control & PHY_CH_POWER_DOWN_OVRD_EN(DPIO_PHY1,
DPIO_CH0)) == 0)drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_control |= PHY_CH_POWER_DOWN_OVRD(0xf,
DPIO_PHY1,DPIO_CH0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- - if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0xf, DPIO_PHY1,
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_CMN_LDO(DPIO_PHY1,
DPIO_CH0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- - if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0x3, DPIO_PHY1,
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_SPLINE_LDO(DPIO_PHY1,
DPIO_CH0, 0);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- if (BITS_SET(phy_control, - PHY_CH_POWER_DOWN_OVRD(0xc, DPIO_PHY1,
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- phy_status |= PHY_STATUS_SPLINE_LDO(DPIO_PHY1,
DPIO_CH0, 1);drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- } - - phy_status &= phy_status_mask; - -/* -* The PHY may be busy with some initial calibration and whatnot,
drivers/gpu/drm/i915/display/intel_display_power.c +0
-4-* so the power state can take a while to actually change. -*/ - if (intel_de_wait_for_register(dev_priv, DISPLAY_PHY_STATUS, - phy_status_mask, phy_status,10))
drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- drm_err(&dev_priv->drm, - "Unexpected PHY_STATUS 0x%08x, expected 0x%08x(PHY_CONTROL=0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- intel_de_read(dev_priv, DISPLAY_PHY_STATUS) &
phy_status_mask,drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- phy_status, dev_priv->chv_phy_control); -} - -#undef BITS_SET - -static void chv_dpio_cmn_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-7-{ -enum dpio_phy phy; -enum pipe pipe; -u32 tmp; - - drm_WARN_ON_ONCE(&dev_priv->drm, - power_well->desc->id !=
VLV_DISP_PW_DPIO_CMN_BC&&drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- power_well->desc->id !=
CHV_DISP_PW_DPIO_CMN_D);drivers/gpu/drm/i915/display/intel_display_power.c +0
-17- -if (power_well->desc->id ==VLV_DISP_PW_DPIO_CMN_BC ) { - pipe =PIPE_A ; - phy =DPIO_PHY0 ; - }else { - pipe =PIPE_C ; - phy =DPIO_PHY1 ; - } - -/* since ref/cri clock was enabled */ -udelay (1 );/* >10ns for cmnreset, >0ns for sidereset */ -vlv_set_power_well (dev_priv, power_well, true); - -/* Poll for phypwrgood signal */ -if (intel_de_wait_for_set (dev_priv,DISPLAY_PHY_STATUS , -PHY_POWERGOOD (phy),1 )) - drm_err(&dev_priv->drm, "Display PHY %d is not powerup\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-39- phy); - -vlv_dpio_get (dev_priv); - -/* Enable dynamic power down */ - tmp =vlv_dpio_read (dev_priv, pipe,CHV_CMN_DW28 ); - tmp |=DPIO_DYNPWRDOWNEN_CH0 |DPIO_CL1POWERDOWNEN | -DPIO_SUS_CLK_CONFIG_GATE_CLKREQ ; -vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW28 , tmp); - -if (power_well->desc->id ==VLV_DISP_PW_DPIO_CMN_BC ) { - tmp =vlv_dpio_read (dev_priv, pipe, _CHV_CMN_DW6_CH1); - tmp |=DPIO_DYNPWRDOWNEN_CH1 ; -vlv_dpio_write (dev_priv, pipe, _CHV_CMN_DW6_CH1, tmp); - }else { -/* -* Force the non-existing CL2 off. BXT does this -* too, so maybe it saves some power even though -* CL2 doesn't exist? -*/ - tmp =vlv_dpio_read (dev_priv, pipe,CHV_CMN_DW30 ); - tmp |=DPIO_CL2_LDOFUSE_PWRENB ; -vlv_dpio_write (dev_priv, pipe,CHV_CMN_DW30 , tmp); - } - -vlv_dpio_put (dev_priv); - - dev_priv->chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); - -drm_dbg_kms (&dev_priv->drm, -"Enabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->chv_phy_control); - -assert_chv_phy_status (dev_priv); -} - -static void chv_dpio_cmn_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-{ -enum dpio_phy phy; - - drm_WARN_ON_ONCE(&dev_priv->drm, - power_well->desc->id !=
VLV_DISP_PW_DPIO_CMN_BC&&drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- power_well->desc->id !=
CHV_DISP_PW_DPIO_CMN_D);drivers/gpu/drm/i915/display/intel_display_power.c +0
-21- -if (power_well->desc->id ==VLV_DISP_PW_DPIO_CMN_BC ) { - phy =DPIO_PHY0 ; -assert_pll_disabled (dev_priv,PIPE_A ); -assert_pll_disabled (dev_priv,PIPE_B ); - }else { - phy =DPIO_PHY1 ; -assert_pll_disabled (dev_priv,PIPE_C ); - } - - dev_priv->chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); - -vlv_set_power_well (dev_priv, power_well, false); - -drm_dbg_kms (&dev_priv->drm, -"Disabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->chv_phy_control); - -/* PHY is fully reset now, so we can enable the PHY state asserts */
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- dev_priv->chv_phy_assert[phy] = true; - -assert_chv_phy_status (dev_priv); -} - -static void assert_chv_phy_powergate(struct drm_i915_private
*dev_priv, enumdpio_phyphy,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-enum dpio_channel ch, booloverride, unsigned int mask)
drivers/gpu/drm/i915/display/intel_display_power.c +0
-25-{ -enum pipe pipe = phy ==DPIO_PHY0 ?PIPE_A :PIPE_C ; -u32 reg, val, expected, actual; - -/* -* The BIOS can leave the PHY is some weird state -* where it doesn't fully power down some parts. -* Disable the asserts until the PHY has been fully -* reset (ie. the power well has been disabled at -* least once). -*/ -if (!dev_priv->chv_phy_assert[phy]) -return ; - -if (ch ==DPIO_CH0 ) - reg = _CHV_CMN_DW0_CH0; -else - reg = _CHV_CMN_DW6_CH1; - -vlv_dpio_get (dev_priv); - val =vlv_dpio_read (dev_priv, pipe, reg); -vlv_dpio_put (dev_priv); - -/* -* This assumes !override is only used when the port is disabled.
drivers/gpu/drm/i915/display/intel_display_power.c +0
-30-* All lanes should power down even without the override when -* the port is disabled. -*/ -if (!override || mask ==0xf ) { - expected =DPIO_ALLDL_POWERDOWN |DPIO_ANYDL_POWERDOWN ; -/* -* If CH1 common lane is not active anymore -* (eg. for pipe B DPLL) the entire channel will -* shut down, which causes the common lane registers -* to read as 0. That means we can't actually check -* the lane power down status bits, but as the entire -* register reads as 0 it's a good indication that the -* channel is indeed entirely powered down. -*/ -if (ch ==DPIO_CH1 && val ==0 ) - expected =0 ; - }else if (mask !=0x0 ) { - expected =DPIO_ANYDL_POWERDOWN ; - }else { - expected =0 ; - } - -if (ch ==DPIO_CH0 ) - actual = val >>DPIO_ANYDL_POWERDOWN_SHIFT_CH0 ; -else - actual = val >>DPIO_ANYDL_POWERDOWN_SHIFT_CH1 ; - actual &=DPIO_ALLDL_POWERDOWN |DPIO_ANYDL_POWERDOWN ; - - drm_WARN(&dev_priv->drm, actual != expected, - "Unexpected DPIO lane power down: all %d, any %d.Expected: all %d, any %d. (0x%x = 0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-8- !!(actual &DPIO_ALLDL_POWERDOWN ), - !!(actual &DPIO_ANYDL_POWERDOWN ), - !!(expected &DPIO_ALLDL_POWERDOWN ), - !!(expected &DPIO_ANYDL_POWERDOWN ), - reg, val); -} - -bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum
dpio_phyphy,drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- enum dpio_channel ch, bool override) -{ - struct i915_power_domains *power_domains = &dev_priv-Quoted 1 line
power_domains;drivers/gpu/drm/i915/display/intel_display_power.c +0
-5-bool was_override; - -mutex_lock (&power_domains->lock); - - was_override = dev_priv->chv_phy_control &
PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- -if (override == was_override) - goto out; - -if (override) - dev_priv->chv_phy_control |=
PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-else - dev_priv->chv_phy_control &=~PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); - - drm_dbg_kms(&dev_priv->drm, - "Power gating DPIO PHY%d CH%d(DPIO_PHY_CONTROL=0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-15- phy, ch, dev_priv->chv_phy_control); - -assert_chv_phy_status (dev_priv); - -out: -mutex_unlock (&power_domains->lock); - -return was_override; -} - -void chv_phy_powergate_lanes (struct intel_encoder *encoder, -bool override,unsigned int mask) -{ -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); - struct i915_power_domains *power_domains = &dev_priv-Quoted 1 line
power_domains;drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- enum dpio_phy phy =vlv_dig_port_to_phy(enc_to_dig_port(encoder));
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- enum dpio_channel ch =vlv_dig_port_to_channel(enc_to_dig_port(encoder));
drivers/gpu/drm/i915/display/intel_display_power.c +0
-4- -mutex_lock (&power_domains->lock); - - dev_priv->chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD(0xf, phy,ch);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1- dev_priv->chv_phy_control |= PHY_CH_POWER_DOWN_OVRD(mask, phy,ch);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-3- -if (override) - dev_priv->chv_phy_control |=
PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-else - dev_priv->chv_phy_control &=~PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); - - drm_dbg_kms(&dev_priv->drm, - "Power gating DPIO PHY%d CH%d lanes 0x%x(PHY_CONTROL=0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-10- phy, ch, mask, dev_priv->chv_phy_control); - -assert_chv_phy_status (dev_priv); - -assert_chv_phy_powergate (dev_priv, phy, ch, override, mask); - -mutex_unlock (&power_domains->lock); -} - -static bool chv_pipe_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-8-{ -enum pipe pipe =PIPE_A ; -bool enabled; -u32 state, ctrl; - -vlv_punit_get (dev_priv); - - state = vlv_punit_read(dev_priv, PUNIT_REG_DSPSSPM) &
DP_SSS_MASK(pipe);drivers/gpu/drm/i915/display/intel_display_power.c +0
-2-/* -* We only ever set the power-on and power-gate states, anything
drivers/gpu/drm/i915/display/intel_display_power.c +0
-8-* else is unexpected. -*/ -drm_WARN_ON (&dev_priv->drm, state !=DP_SSS_PWR_ON (pipe) && - state !=DP_SSS_PWR_GATE (pipe)); - enabled = state ==DP_SSS_PWR_ON (pipe); - -/* -* A transient state at this point would mean some unexpected party
drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-* is poking at the power controls too. -*/ - ctrl = vlv_punit_read(dev_priv, PUNIT_REG_DSPSSPM) &
DP_SSC_MASK(pipe);drivers/gpu/drm/i915/display/intel_display_power.c +0
-8-drm_WARN_ON (&dev_priv->drm, ctrl <<16 != state); - -vlv_punit_put (dev_priv); - -return enabled; -} - -static void chv_set_pipe_power_well(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-13- struct i915_power_well *power_well, - bool enable) -{ -enum pipe pipe =PIPE_A ; -u32 state; -u32 ctrl; - - state = enable ?DP_SSS_PWR_ON (pipe) :DP_SSS_PWR_GATE (pipe); - -vlv_punit_get (dev_priv); - -#define COND \ - ((vlv_punit_read(dev_priv, PUNIT_REG_DSPSSPM) &
DP_SSS_MASK(pipe)) == state)drivers/gpu/drm/i915/display/intel_display_power.c +0
-12- -if (COND ) - goto out; - - ctrl =vlv_punit_read (dev_priv,PUNIT_REG_DSPSSPM ); - ctrl &= ~DP_SSC_MASK (pipe); - ctrl |= enable ?DP_SSC_PWR_ON (pipe) :DP_SSC_PWR_GATE (pipe); -vlv_punit_write (dev_priv,PUNIT_REG_DSPSSPM , ctrl); - -if (wait_for (COND ,100 )) - drm_err(&dev_priv->drm, - "timeout setting power well state %08x(%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power.c +0
-10- state, - vlv_punit_read(dev_priv, PUNIT_REG_DSPSSPM)); - -#undef COND - -out: -vlv_punit_put (dev_priv); -} - -static void chv_pipe_power_well_sync_hw(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-{ -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->chv_phy_control); -} - -static void chv_pipe_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-7-{ -chv_set_pipe_power_well (dev_priv, power_well, true); - -vlv_display_power_well_init (dev_priv); -} - -static void chv_pipe_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-{ -vlv_display_power_well_deinit (dev_priv); - -chv_set_pipe_power_well (dev_priv, power_well, false); -} - static u64 __async_put_domains_mask(struct i915_power_domains
*power_domains)
{drivers/gpu/drm/i915/display/intel_display_power.c +0
-1return power_domains->async_put_domains[0] |@@ -3046,27 +1477,6 @@ intel_display_power_put_mask_in_set(struct drm_i915_private *i915,#define XELPD_DDI_IO_TC3_POWER_DOMAINS BIT_ULL(POWER_D OMAIN_PORT_DDI_IO_TC3)#define XELPD_DDI_IO_TC4_POWER_DOMAINS BIT_ULL(POWER_D OMAIN_PORT_DDI_IO_TC4) -static const struct i915_power_well_ops
i9xx_always_on_power_well_ops= {drivers/gpu/drm/i915/display/intel_display_power.c +0
-14- .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = i9xx_always_on_power_well_noop, - .disable = i9xx_always_on_power_well_noop, - .is_enabled = i9xx_always_on_power_well_enabled, -}; - -static const struct i915_power_well_ops chv_pipe_power_well_ops = { - .sync_hw = chv_pipe_power_well_sync_hw, - .enable = chv_pipe_power_well_enable, - .disable = chv_pipe_power_well_disable, - .is_enabled = chv_pipe_power_well_enabled, -}; - -static const struct i915_power_well_ops chv_dpio_cmn_power_well_ops= {
drivers/gpu/drm/i915/display/intel_display_power.c +0
-6- .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = chv_dpio_cmn_power_well_enable, - .disable = chv_dpio_cmn_power_well_disable, - .is_enabled = vlv_power_well_enabled, -}; -static const struct i915_power_well_desc i9xx_always_on_power_well[]= {
drivers/gpu/drm/i915/display/intel_display_power.c +0
-7{ .name = "always-on",@@ -3077,13 +1487,6 @@ static const struct i915_power_well_desc i9xx_always_on_power_well[] = { }, }; -static const struct i915_power_well_ops i830_pipes_power_well_ops = { - .sync_hw = i830_pipes_power_well_sync_hw, - .enable = i830_pipes_power_well_enable, - .disable = i830_pipes_power_well_disable, - .is_enabled = i830_pipes_power_well_enabled, -}; - static const struct i915_power_well_desc i830_power_wells[] = {drivers/gpu/drm/i915/display/intel_display_power.c +0
-29{ .name = "always-on",@@ -3100,35 +1503,6 @@ static const struct i915_power_well_desc i830_power_wells[] = { }, }; -static const struct i915_power_well_regs hsw_power_well_regs = { - .bios =HSW_PWR_WELL_CTL1 , - .driver =HSW_PWR_WELL_CTL2 , - .kvmr =HSW_PWR_WELL_CTL3 , - .debug =HSW_PWR_WELL_CTL4 , -}; - -static const struct i915_power_well_ops hsw_power_well_ops = { - .regs = &hsw_power_well_regs, - .sync_hw = hsw_power_well_sync_hw, - .enable = hsw_power_well_enable, - .disable = hsw_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; - -static const struct i915_power_well_ops gen9_dc_off_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = gen9_dc_off_power_well_enable, - .disable = gen9_dc_off_power_well_disable, - .is_enabled = gen9_dc_off_power_well_enabled, -}; - -static const struct i915_power_well_ops bxt_dpio_cmn_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = bxt_dpio_cmn_power_well_enable, - .disable = bxt_dpio_cmn_power_well_disable, - .is_enabled = bxt_dpio_cmn_power_well_enabled, -}; -static const struct
i915_power_well_deschsw_power_wells[] = {drivers/gpu/drm/i915/display/intel_display_power.c +0
-21{ .name = "always-on",@@ -3170,27 +1544,6 @@ static const struct i915_power_well_desc bdw_power_wells[] = { }, }; -static const struct i915_power_well_ops vlv_display_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = vlv_display_power_well_enable, - .disable = vlv_display_power_well_disable, - .is_enabled = vlv_power_well_enabled, -}; - -static const struct i915_power_well_ops vlv_dpio_cmn_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = vlv_dpio_cmn_power_well_enable, - .disable = vlv_dpio_cmn_power_well_disable, - .is_enabled = vlv_power_well_enabled, -}; - -static const struct i915_power_well_ops vlv_dpio_power_well_ops = { - .sync_hw = i9xx_power_well_sync_hw_noop, - .enable = vlv_power_well_enable, - .disable = vlv_power_well_disable, - .is_enabled = vlv_power_well_enabled, -}; -static const struct
i915_power_well_descvlv_power_wells[] = {drivers/gpu/drm/i915/display/intel_display_power.c +0
-28{ .name = "always-on",@@ -3572,34 +1925,6 @@ static const struct i915_power_well_desc glk_power_wells[] = { }, }; -static const struct i915_power_well_regs icl_aux_power_well_regs = { - .bios =ICL_PWR_WELL_CTL_AUX1 , - .driver =ICL_PWR_WELL_CTL_AUX2 , - .debug =ICL_PWR_WELL_CTL_AUX4 , -}; - -static const struct i915_power_well_ops icl_aux_power_well_ops = { - .regs = &icl_aux_power_well_regs, - .sync_hw = hsw_power_well_sync_hw, - .enable = icl_aux_power_well_enable, - .disable = icl_aux_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; - -static const struct i915_power_well_regs icl_ddi_power_well_regs = { - .bios =ICL_PWR_WELL_CTL_DDI1 , - .driver =ICL_PWR_WELL_CTL_DDI2 , - .debug =ICL_PWR_WELL_CTL_DDI4 , -}; - -static const struct i915_power_well_ops icl_ddi_power_well_ops = { - .regs = &icl_ddi_power_well_regs, - .sync_hw = hsw_power_well_sync_hw, - .enable = hsw_power_well_enable, - .disable = hsw_power_well_disable, - .is_enabled = hsw_power_well_enabled, -}; -static const struct i915_power_well_desc icl_power_wells[] = { {drivers/gpu/drm/i915/display/intel_display_power.c +0
-17.name = "always-on",@@ -3813,90 +2138,6 @@ static const struct i915_power_well_desc icl_power_wells[] = { }, }; -static void -tgl_tc_cold_request (struct drm_i915_private *i915,bool block) -{ -u8 tries =0 ; -int ret; - -while (1 ) { -u32 low_val; -u32 high_val =0 ; - -if (block) - low_val =TGL_PCODE_EXIT_TCCOLD_DATA_L_BLOCK_REQ ; -else - low_val =TGL_PCODE_EXIT_TCCOLD_DATA_L_UNBLOCK_REQ ; - -/* -* Spec states that we should timeout the request after 200us
drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-* but the function below will timeout after 500us -*/ - ret = snb_pcode_read(i915, TGL_PCODE_TCCOLD, &low_val,
&high_val);drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-if (ret ==0 ) { - if (block && - (low_val &
TGL_PCODE_EXIT_TCCOLD_DATA_L_EXIT_FAILED))drivers/gpu/drm/i915/display/intel_display_power.c +0
-45- ret = -EIO ; - else - break; - } - -if (++tries ==3 ) -break ; - -msleep (1 ); - } - -if (ret) -drm_err (&i915->drm,"TC cold %sblock failed\n" , - block ?"" :"un" ); -else -drm_dbg_kms (&i915->drm,"TC cold %sblock succeeded\n" , - block ?"" :"un" ); -} - -static void -tgl_tc_cold_off_power_well_enable (struct drm_i915_private *i915, -struct i915_power_well *power_well) -{ -tgl_tc_cold_request (i915, true); -} - -static void -tgl_tc_cold_off_power_well_disable (struct drm_i915_private *i915, -struct i915_power_well *power_well) -{ -tgl_tc_cold_request (i915, false); -} - -static void -tgl_tc_cold_off_power_well_sync_hw (struct drm_i915_private *i915, -struct i915_power_well *power_well) -{ -if (intel_power_well_refcount (power_well) >0 ) -tgl_tc_cold_off_power_well_enable (i915, power_well); -else -tgl_tc_cold_off_power_well_disable (i915, power_well); -} - -static bool -tgl_tc_cold_off_power_well_is_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power.c +0
-3-{ -/* -* Not the correctly implementation but there is no way to just read it
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* from PCODE, so returning count to avoid state mismatch errors
drivers/gpu/drm/i915/display/intel_display_power.c +0
-11-*/ -return intel_power_well_refcount (power_well); -} - -static const struct i915_power_well_ops tgl_tc_cold_off_ops = { - .sync_hw = tgl_tc_cold_off_power_well_sync_hw, - .enable = tgl_tc_cold_off_power_well_enable, - .disable = tgl_tc_cold_off_power_well_disable, - .is_enabled = tgl_tc_cold_off_power_well_is_enabled, -}; -static const struct i915_power_well_desc tgl_power_wells[] = { { .name ="always-on" ,drivers/gpu/drm/i915/display/intel_display_power.h +0
-0@@ -305,9 +305,4 @@ void gen9_dbuf_slices_update(struct drm_i915_private *dev_priv, for ((wf) = intel_display_power_get_if_enabled((i915), (domain)); (wf); \ intel_display_power_put_async((i915), (domain), (wf)),(wf) = 0)
drivers/gpu/drm/i915/display/intel_display_power.h +0
-3-void chv_phy_powergate_lanes (struct intel_encoder *encoder, -bool override,unsigned int mask); -bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum
dpio_phyphy,drivers/gpu/drm/i915/display/intel_display_power.h +0
-2- enum dpio_channel ch, bool override); -#endif /* __INTEL_DISPLAY_POWER_H__ */ drivers/gpu/drm/i915/display/intel_display_power_well.c +28
-0@@ -4,7 +4,58 @@*/ #include "i915_drv.h" +#include "i915_irq.h" +#include "intel_combo_phy.h" +#include "intel_combo_phy_regs.h" +#include "intel_crt.h" +#include "intel_de.h" #include "intel_display_power_well.h" +#include "intel_display_types.h" +#include "intel_dpio_phy.h" +#include "intel_dpll.h" +#include "intel_hotplug.h" +#include "intel_pcode.h" +#include "intel_pm.h" +#include "intel_pps.h" +#include "intel_vga.h" +#include "intel_tc.h" +#include "vlv_sideband.h" +#include "vlv_sideband_reg.h" + +struct i915_power_well_regs { +i915_reg_t bios; +i915_reg_t driver; +i915_reg_t kvmr; +i915_reg_t debug; +}; + +struct i915_power_well_ops { +const struct i915_power_well_regs *regs; +/* +* Synchronize the well's hw state to match the current sw state, for
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* example enable/disable it based on the current refcount. Called
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* during driver init and resume time, possibly after first calling
drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+* the enable/disable handlers. +*/ +void (*sync_hw)(struct drm_i915_private *i915, +struct i915_power_well *power_well); +/* +* Enable the well and resources that depend on it (for example +* interrupts located on the well). Called after the 0->1 refcount
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+* transition. +*/ +void (*enable)(struct drm_i915_private *i915, +struct i915_power_well *power_well); +/* +* Disable the well and resources that depend on it. Called after
drivers/gpu/drm/i915/display/intel_display_power_well.c +11
-0+* the 1->0 refcount transition. +*/ +void (*disable)(struct drm_i915_private *i915, +struct i915_power_well *power_well); +/* Returns the hw enabled state. */ +bool (*is_enabled)(struct drm_i915_private *i915, +struct i915_power_well *power_well); +};struct i915_power_well * lookup_power_well(struct drm_i915_private *i915,@@ -111,3 +162,1769 @@ int intel_power_well_refcount(struct i915_power_well *power_well) {return power_well->count; } + +/* +* Starting with Haswell, we have a "Power Down Well" that can be turned off
+ * when not needed anymore. We have 4 registers that can request the power well
+ * to be enabled, and it will only be disabled if none of the registers is
+ * requesting it to be enabled.
+ */
+static void hsw_power_well_post_enable(structdrm_i915_private*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+ u8 irq_pipe_mask, bool has_vga) +{ + if (has_vga) + intel_vga_reset_io_mem(dev_priv); + + if (irq_pipe_mask) + gen8_irq_power_well_post_enable(dev_priv,
irq_pipe_mask);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+} + +static void hsw_power_well_pre_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+ u8 irq_pipe_mask) +{ +if (irq_pipe_mask) + gen8_irq_power_well_pre_disable(dev_priv,
irq_pipe_mask);drivers/gpu/drm/i915/display/intel_display_power_well.c +9
-0+} + +#define ICL_AUX_PW_TO_CH (pw_idx) \ + ((pw_idx) - ICL_PW_CTL_IDX_AUX_A + AUX_CH_A) + +#define ICL_TBT_AUX_PW_TO_CH (pw_idx) \ + ((pw_idx) - ICL_PW_CTL_IDX_AUX_TBT1 + AUX_CH_C) + +static enum aux_ch icl_aux_pw_to_ch(const struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+{ +int pw_idx = power_well->desc->hsw.idx; + + return power_well->desc->hsw.is_tc_tbt ?
ICL_TBT_AUX_PW_TO_CH(pw_idx):drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ ICL_AUX_PW_TO_CH(pw_idx);
drivers/gpu/drm/i915/display/intel_display_power_well.c +31
-0+} + +static struct intel_digital_port * +aux_ch_to_digital_port (struct drm_i915_private *dev_priv, +enum aux_ch aux_ch) +{ +struct intel_digital_port *dig_port =NULL ; +struct intel_encoder *encoder; + +for_each_intel_encoder (&dev_priv->drm, encoder) { +/* We'll check the MST primary port */ +if (encoder->type ==INTEL_OUTPUT_DP_MST ) +continue ; + + dig_port =enc_to_dig_port (encoder); +if (!dig_port) +continue ; + +if (dig_port->aux_ch != aux_ch) { + dig_port =NULL ; +continue ; + } + +break ; + } + +return dig_port; +} + +static enum phy icl_aux_pw_to_phy (struct drm_i915_private *i915, + const struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+{ +enum aux_ch aux_ch =icl_aux_pw_to_ch (power_well); + struct intel_digital_port *dig_port =
aux_ch_to_digital_port(i915, aux_ch);drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+ +return intel_port_to_phy (i915, dig_port->base.port); +} + +static void hsw_wait_for_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well,drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+ bool timeout_expected) +{ + const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+int pw_idx = power_well->desc->hsw.idx; +int enable_delay = power_well->desc->hsw.fixed_enable_delay; + +/* +* For some power wells we're not supposed to watch the status bit for
drivers/gpu/drm/i915/display/intel_display_power_well.c +9
-0+* an ack, but rather just wait a fixed amount of time and then +* proceed. This is only used on DG2. +*/ +if (IS_DG2 (dev_priv) && enable_delay) { +usleep_range (enable_delay,2 * enable_delay); +return ; + } + +/* Timeout for PW1:10 us, AUX:not specified, other PWs:20 us. */
drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+if (intel_de_wait_for_set (dev_priv, regs->driver, +HSW_PWR_WELL_CTL_STATE (pw_idx),1 )) { + drm_dbg_kms(&dev_priv->drm, "%s power well enabletimeout\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +8
-0+ intel_power_well_name(power_well)); + +drm_WARN_ON (&dev_priv->drm, !timeout_expected); + + } +} + +static u32 hsw_power_well_requesters(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ const struct i915_power_well_regs*regs,
drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+ int pw_idx) +{ +u32 req_mask =HSW_PWR_WELL_CTL_REQ (pw_idx); +u32 ret; + + ret =intel_de_read (dev_priv, regs->bios) & req_mask ?1 :0 ; + ret |= intel_de_read(dev_priv, regs->driver) & req_mask ? 2 :0;
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+if (regs->kvmr.reg) + ret |= intel_de_read(dev_priv, regs->kvmr) & req_mask ?4 : 0;
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+ ret |=intel_de_read (dev_priv, regs->debug) & req_mask ?8 :0 ; + +return ret; +} + +static void hsw_wait_for_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+{ + const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+int pw_idx = power_well->desc->hsw.idx; +bool disabled; +u32 reqs; + +/* +* Bspec doesn't require waiting for PWs to get disabled, but still do
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* this for paranoia. The known cases where a PW will be forced on:
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* - a KVMR request on any power well via the KVMR request register
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* - a DMC request on PW1 and MISC_IO power wells via the BIOS and
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+* DEBUG request registers +* Skip the wait in case any of the request bits are set and print a
drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+* diagnostic message. +*/ + wait_for((disabled = !(intel_de_read(dev_priv, regs->driver) & + HSW_PWR_WELL_CTL_STATE(pw_idx))) || + (reqs = hsw_power_well_requesters(dev_priv, regs,
pw_idx)), 1);drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+if (disabled) +return ; + + drm_dbg_kms(&dev_priv->drm, + "%s forced on (bios:%d driver:%d kvmr:%ddebug:%d)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+intel_power_well_name (power_well), + !!(reqs & 1), !!(reqs & 2), !!(reqs & 4), !!(reqs &8));
drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+} + +static void gen9_wait_for_power_well_fuses(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+ enum skl_power_gate pg) +{ +/* Timeout 5us for PG#0, for other PGs 1us */ + drm_WARN_ON(&dev_priv->drm, + intel_de_wait_for_set(dev_priv, SKL_FUSE_STATUS, + SKL_FUSE_PG_DIST_STATUS(pg),1));
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+} + +static void hsw_power_well_enable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ + const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+int pw_idx = power_well->desc->hsw.idx; +u32 val; + +if (power_well->desc->hsw.has_fuses) { +enum skl_power_gate pg; + + pg = DISPLAY_VER(dev_priv) >= 11 ?
ICL_PW_CTL_IDX_TO_PG(pw_idx):drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ SKL_PW_CTL_IDX_TO_PG(p
w_idx);drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+ +/* Wa_16013190616:adlp */ +if (IS_ALDERLAKE_P (dev_priv) && pg ==SKL_PG1 ) + intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0,
DISABLE_FLR_SRC);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+ +/* +* For PW1 we have to wait both for the PW0/PG0 fuse state
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* before enabling the power well and PW1/PG1's own fuse
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* state after the enabling. For all other power wells with
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* fuses we only have to wait for that PW/PG's fuse state
drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+* after the enabling. +*/ +if (pg ==SKL_PG1 ) + gen9_wait_for_power_well_fuses(dev_priv,
SKL_PG0);drivers/gpu/drm/i915/display/intel_display_power_well.c +12
-0+ } + + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val |HSW_PWR_WELL_CTL_REQ (pw_idx)); + +hsw_wait_for_power_well_enable (dev_priv, power_well, false); + +if (power_well->desc->hsw.has_fuses) { +enum skl_power_gate pg; + + pg = DISPLAY_VER(dev_priv) >= 11 ?
ICL_PW_CTL_IDX_TO_PG(pw_idx):drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ SKL_PW_CTL_IDX_TO_PG(p
w_idx);drivers/gpu/drm/i915/display/intel_display_power_well.c +9
-0+gen9_wait_for_power_well_fuses (dev_priv, pg); + } + +hsw_power_well_post_enable (dev_priv, + power_well->desc->hsw.irq_pipe_mask, + power_well->desc->hsw.has_vga); +} + +static void hsw_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+ struct i915_power_well *power_well) +{ + const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+int pw_idx = power_well->desc->hsw.idx; +u32 val; + + hsw_power_well_pre_disable(dev_priv, + power_well->desc-Quoted 1 line
hsw.irq_pipe_mask);
drivers/gpu/drm/i915/display/intel_display_power_well.c +9
-0+ + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val & ~HSW_PWR_WELL_CTL_REQ (pw_idx)); +hsw_wait_for_power_well_disable (dev_priv, power_well); +} + +static void +icl_combo_phy_aux_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+ struct i915_power_well *power_well) +{ + const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +20
-0+int pw_idx = power_well->desc->hsw.idx; +enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); +u32 val; + +drm_WARN_ON (&dev_priv->drm, !IS_ICELAKE (dev_priv)); + + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val |HSW_PWR_WELL_CTL_REQ (pw_idx)); + +if (DISPLAY_VER (dev_priv) <12 ) { + val =intel_de_read (dev_priv,ICL_PORT_CL_DW12 (phy)); +intel_de_write (dev_priv,ICL_PORT_CL_DW12 (phy), + val |ICL_LANE_ENABLE_AUX ); + } + +hsw_wait_for_power_well_enable (dev_priv, power_well, false); + +/* Display WA #1178: icl */ + if (pw_idx >= ICL_PW_CTL_IDX_AUX_A && pw_idx <=
ICL_PW_CTL_IDX_AUX_B&&drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+ !intel_bios_is_port_edp(dev_priv, (enum port)phy)) { + val = intel_de_read(dev_priv,
ICL_AUX_ANAOVRD1(pw_idx));drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ val |= ICL_AUX_ANAOVRD1_ENABLE |
ICL_AUX_ANAOVRD1_LDO_BYPASS;drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ intel_de_write(dev_priv, ICL_AUX_ANAOVRD1(pw_idx),val);
drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+ } +} + +static void +icl_combo_phy_aux_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+{ + const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +20
-0+int pw_idx = power_well->desc->hsw.idx; +enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); +u32 val; + +drm_WARN_ON (&dev_priv->drm, !IS_ICELAKE (dev_priv)); + + val =intel_de_read (dev_priv,ICL_PORT_CL_DW12 (phy)); +intel_de_write (dev_priv,ICL_PORT_CL_DW12 (phy), + val & ~ICL_LANE_ENABLE_AUX ); + + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val & ~HSW_PWR_WELL_CTL_REQ (pw_idx)); + +hsw_wait_for_power_well_disable (dev_priv, power_well); +} + +#if IS_ENABLED (CONFIG_DRM_I915_DEBUG_RUNTIME_PM ) + +static void icl_tc_port_assert_ref_held(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct intel_digital_port
*dig_port)drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+{ +if (drm_WARN_ON (&dev_priv->drm, !dig_port)) +return ; + + if (DISPLAY_VER(dev_priv) == 11 &&
intel_tc_cold_requires_aux_pw(dig_port))drivers/gpu/drm/i915/display/intel_display_power_well.c +8
-0+return ; + +drm_WARN_ON (&dev_priv->drm, !intel_tc_port_ref_held (dig_port)); +} + +#else + +static void icl_tc_port_assert_ref_held(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct intel_digital_port
*dig_port)drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+{ +} + +#endif + +#define TGL_AUX_PW_TO_TC_PORT (pw_idx) ((pw_idx) -
TGL_PW_CTL_IDX_AUX_TC1)drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+ +static void icl_tc_cold_exit (struct drm_i915_private *i915) +{ +int ret, tries =0 ; + +while (1 ) { + ret = snb_pcode_write_timeout(i915,
ICL_PCODE_EXIT_TCCOLD, 0,drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+ 250, 1); +if (ret != -EAGAIN || ++tries ==3 ) +break ; +msleep (1 ); + } + +/* Spec states that TC cold exit can take up to 1ms to complete */
drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+if (!ret) +msleep (1 ); + +/* TODO: turn failure into a error as soon i915 CI updates ICL IFWI */
drivers/gpu/drm/i915/display/intel_display_power_well.c +10
-0+drm_dbg_kms (&i915->drm,"TC cold block %s\n" , ret ?"failed" : +"succeeded" ); +} + +static void +icl_tc_phy_aux_power_well_enable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +enum aux_ch aux_ch =icl_aux_pw_to_ch (power_well); + struct intel_digital_port *dig_port =
aux_ch_to_digital_port(dev_priv, aux_ch);drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +15
-0+bool is_tbt = power_well->desc->hsw.is_tc_tbt; +bool timeout_expected; +u32 val; + +icl_tc_port_assert_ref_held (dev_priv, power_well, dig_port); + + val =intel_de_read (dev_priv,DP_AUX_CH_CTL (aux_ch)); + val &= ~DP_AUX_CH_CTL_TBT_IO ; +if (is_tbt) + val |=DP_AUX_CH_CTL_TBT_IO ; +intel_de_write (dev_priv,DP_AUX_CH_CTL (aux_ch), val); + + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val | HSW_PWR_WELL_CTL_REQ(power_well->desc-Quoted 1 line
hsw.idx));
drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+ +/* +* An AUX timeout is expected if the TBT DP tunnel is down, +* or need to enable AUX on a legacy TypeC port as part of the TC-cold
drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+* exit sequence. +*/ + timeout_expected = is_tbt ||
intel_tc_cold_requires_aux_pw(dig_port);drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ if (DISPLAY_VER(dev_priv) == 11 &&
intel_tc_cold_requires_aux_pw(dig_port))drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+icl_tc_cold_exit (dev_priv); + + hsw_wait_for_power_well_enable(dev_priv, power_well,
timeout_expected);drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+ +if (DISPLAY_VER (dev_priv) >=12 && !is_tbt) { +enum tc_port tc_port; + + tc_port = TGL_AUX_PW_TO_TC_PORT(power_well->desc-Quoted 1 line
hsw.idx);
drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), +HIP_INDEX_VAL (tc_port,0x2 )); + + if (intel_de_wait_for_set(dev_priv,
DKL_CMN_UC_DW_27(tc_port),drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ DKL_CMN_UC_DW27_UC_HEALTH,1))
drivers/gpu/drm/i915/display/intel_display_power_well.c +11
-0+drm_warn (&dev_priv->drm, +"Timeout waiting TC uC health\n" ); + } +} + +static void +icl_tc_phy_aux_power_well_disable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +enum aux_ch aux_ch =icl_aux_pw_to_ch (power_well); + struct intel_digital_port *dig_port =
aux_ch_to_digital_port(dev_priv, aux_ch);drivers/gpu/drm/i915/display/intel_display_power_well.c +14
-0+ +icl_tc_port_assert_ref_held (dev_priv, power_well, dig_port); + +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) +{ +enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); + +if (intel_phy_is_tc (dev_priv, phy)) + return icl_tc_phy_aux_power_well_enable(dev_priv,
power_well);drivers/gpu/drm/i915/display/intel_display_power_well.c +15
-0+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) +{ +enum phy phy =icl_aux_pw_to_phy (dev_priv, power_well); + +if (intel_phy_is_tc (dev_priv, phy)) + return icl_tc_phy_aux_power_well_disable(dev_priv,
power_well);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+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_well.c +6
-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 to
+ * be enabled.
+ */
+static bool hsw_power_well_enabled(structdrm_i915_private*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+ struct i915_power_well *power_well) +{ + const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +10
-0+enum i915_power_well_id id = power_well->desc->id; +int pw_idx = power_well->desc->hsw.idx; +u32 mask =HSW_PWR_WELL_CTL_REQ (pw_idx) | +HSW_PWR_WELL_CTL_STATE (pw_idx); +u32 val; + + val =intel_de_read (dev_priv, regs->driver); + +/* +* On GEN9 big core due to a DMC bug the driver's request bits for PW1
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* and the MISC_IO PW will be not restored, so check instead for the
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* BIOS's own request bits, which are forced-on for these power wells
drivers/gpu/drm/i915/display/intel_display_power_well.c +13
-0+* when exiting DC5/6. +*/ +if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv) && + (id ==SKL_DISP_PW_1 || id ==SKL_DISP_PW_MISC_IO )) + val |=intel_de_read (dev_priv, regs->bios); + +return (val & mask) == mask; +} + +static void assert_can_enable_dc9 (struct drm_i915_private *dev_priv) +{ + drm_WARN_ONCE(&dev_priv->drm, + (intel_de_read(dev_priv, DC_STATE_EN) &
DC_STATE_EN_DC9),drivers/gpu/drm/i915/display/intel_display_power_well.c +14
-0+ "DC9 already programmed to be enabled.\n"); +drm_WARN_ONCE (&dev_priv->drm, +intel_de_read (dev_priv,DC_STATE_EN ) & +DC_STATE_EN_UPTO_DC5 , +"DC5 still not disabled to enable DC9.\n" ); +drm_WARN_ONCE (&dev_priv->drm, +intel_de_read (dev_priv,HSW_PWR_WELL_CTL2 ) & +HSW_PWR_WELL_CTL_REQ (SKL_PW_CTL_IDX_PW_2 ), +"Power well 2 on.\n" ); +drm_WARN_ONCE (&dev_priv->drm,intel_irqs_enabled (dev_priv), +"Interrupts not disabled yet.\n" ); + +/* +* TODO: check for the following to verify the conditions to enter DC9
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+* state are satisfied: +* 1] Check relevant display engine registers to verify if mode set
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+* disable sequence was followed. +* 2] Check if display uninitialize sequence is initialized. +*/ +} + +static void assert_can_disable_dc9(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power_well.c +10
-0+{ +drm_WARN_ONCE (&dev_priv->drm,intel_irqs_enabled (dev_priv), +"Interrupts not disabled yet.\n" ); +drm_WARN_ONCE (&dev_priv->drm, +intel_de_read (dev_priv,DC_STATE_EN ) & +DC_STATE_EN_UPTO_DC5 , +"DC5 still not disabled.\n" ); + +/* +* TODO: check for the following to verify DC9 state was indeed
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+* entered before programming to disable it: +* 1] Check relevant display engine registers to verify if mode
drivers/gpu/drm/i915/display/intel_display_power_well.c +17
-0+* set disable sequence was followed. +* 2] Check if display uninitialize sequence is initialized. +*/ +} + +static void gen9_write_dc_state (struct drm_i915_private *dev_priv, +u32 state) +{ +int rewrites =0 ; +int rereads =0 ; +u32 v; + +intel_de_write (dev_priv,DC_STATE_EN , state); + +/* It has been observed that disabling the dc6 state sometimes +* doesn't stick and dmc keeps returning old value. Make sure +* the write really sticks enough times and also force rewrite until
drivers/gpu/drm/i915/display/intel_display_power_well.c +54
-0+* we are confident that state is exactly what we want. +*/ +do { + v =intel_de_read (dev_priv,DC_STATE_EN ); + +if (v != state) { +intel_de_write (dev_priv,DC_STATE_EN , state); + rewrites++; + rereads =0 ; + }else if (rereads++ >5 ) { +break ; + } + + }while (rewrites <100 ); + +if (v != state) +drm_err (&dev_priv->drm, +"Writing dc state to 0x%x failed, now 0x%x\n" , + state, v); + +/* Most of the times we need one retry, avoid spam */ +if (rewrites >1 ) +drm_dbg_kms (&dev_priv->drm, +"Rewrote dc state to 0x%x %d times\n" , + state, rewrites); +} + +static u32 gen9_dc_mask (struct drm_i915_private *dev_priv) +{ +u32 mask; + + mask =DC_STATE_EN_UPTO_DC5 ; + +if (DISPLAY_VER (dev_priv) >=12 ) + mask |=DC_STATE_EN_DC3CO |DC_STATE_EN_UPTO_DC6 + |DC_STATE_EN_DC9 ; +else if (DISPLAY_VER (dev_priv) ==11 ) + mask |=DC_STATE_EN_UPTO_DC6 |DC_STATE_EN_DC9 ; +else if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) + mask |=DC_STATE_EN_DC9 ; +else + mask |=DC_STATE_EN_UPTO_DC6 ; + +return mask; +} + +void gen9_sanitize_dc_state (struct drm_i915_private *dev_priv) +{ +u32 val; + +if (!HAS_DISPLAY (dev_priv)) +return ; + + val = intel_de_read(dev_priv, DC_STATE_EN) &
gen9_dc_mask(dev_priv);drivers/gpu/drm/i915/display/intel_display_power_well.c +17
-0+ +drm_dbg_kms (&dev_priv->drm, +"Resetting DC state tracking from %02x to %02x\n" , + dev_priv->dmc.dc_state, val); + dev_priv->dmc.dc_state = val; +} + +/** +* gen9_set_dc_state - set target display C power state +* @dev_priv: i915 device instance +* @state: target DC power state +* - DC_STATE_DISABLE +* - DC_STATE_EN_UPTO_DC5 +* - DC_STATE_EN_UPTO_DC6 +* - DC_STATE_EN_DC9 +* +* Signal to DMC firmware/HW the target DC power state passed in @state.
+ * DMC/HW can turn off individual display clocks and power rails when entering
+ * a deeper DC power state (higher in number) and turns these back when exiting
+ * that state to a shallower power state (lower in number). The HW will decide
+ * when to actually enter a given state on an on-demand basis, for instance
+ * depending on the active state of display pipes. The state of display
+ * registers backed by affected power rails are saved/restored as needed.
+ *
+ * Based on the above enabling a deeper DC power state is asynchronous wrt.
+ * enabling it. Disabling a deeper power state is synchronous: for instance
+ * setting %DC_STATE_DISABLE won't complete until all HW resources are turned
+ * back on and register state is restored. This is guaranteed by the MMIO write
+ * toDC_STATE_ENblocking until the state is restored.
+ */drivers/gpu/drm/i915/display/intel_display_power_well.c +15
-0+void gen9_set_dc_state (struct drm_i915_private *dev_priv,u32 state) +{ +u32 val; +u32 mask; + +if (!HAS_DISPLAY (dev_priv)) +return ; + +if (drm_WARN_ON_ONCE (&dev_priv->drm, + state & ~dev_priv->dmc.allowed_dc_mask)) + state &= dev_priv->dmc.allowed_dc_mask; + + val =intel_de_read (dev_priv,DC_STATE_EN ); + mask =gen9_dc_mask (dev_priv); + drm_dbg_kms(&dev_priv->drm, "Setting DC state from %02x to%02x\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+ val & mask, state); + +/* Check if DMC is ignoring our DC state requests */ +if ((val & mask) != dev_priv->dmc.dc_state) + drm_err(&dev_priv->drm, "DC state mismatch (0x%x ->0x%x)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +36
-0+ dev_priv->dmc.dc_state, val & mask); + + val &= ~mask; + val |= state; + + gen9_write_dc_state(dev_priv, val); + + dev_priv->dmc.dc_state = val & mask; +} + +static void tgl_enable_dc3co(struct drm_i915_private *dev_priv) +{ + drm_dbg_kms(&dev_priv->drm, "Enabling DC3CO\n"); + gen9_set_dc_state(dev_priv, DC_STATE_EN_DC3CO); +} + +static void tgl_disable_dc3co(struct drm_i915_private *dev_priv) +{ + u32 val; + + drm_dbg_kms(&dev_priv->drm, "Disabling DC3CO\n"); + val = intel_de_read(dev_priv, DC_STATE_EN); + val &= ~DC_STATE_DC3CO_STATUS; + intel_de_write(dev_priv, DC_STATE_EN, val); + gen9_set_dc_state(dev_priv, DC_STATE_DISABLE); + /* + * Delay of 200us DC3CO Exit time B.Spec 49196 + */ + usleep_range(200, 210); +} + +static void assert_dmc_loaded(struct drm_i915_private *dev_priv) +{ + drm_WARN_ONCE(&dev_priv->drm, + !intel_de_read(dev_priv, + DMC_PROGRAM(dev_priv-Quoted 1 line
dmc.dmc_info[DMC_FW_MAIN].start_mmioaddr, 0)),
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ "DMC program storage start isNULL\n");
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ drm_WARN_ONCE(&dev_priv->drm, !intel_de_read(dev_priv,
DMC_SSP_BASE),drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+ "DMC SSP Base Not fine\n"); + drm_WARN_ONCE(&dev_priv->drm, !intel_de_read(dev_priv,
DMC_HTP_SKL),drivers/gpu/drm/i915/display/intel_display_power_well.c +8
-0+ "DMC HTP Not fine\n"); +} + +static void assert_can_enable_dc5 (struct drm_i915_private *dev_priv) +{ +enum i915_power_well_id high_pg; + +/* Power wells at this level and above must be disabled for DC5 entry */
drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+if (DISPLAY_VER (dev_priv) ==12 ) + high_pg =ICL_DISP_PW_3 ; +else + high_pg =SKL_DISP_PW_2 ; + + drm_WARN_ONCE(&dev_priv->drm, + intel_display_power_well_is_enabled(dev_priv,
high_pg),drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ "Power wells above platform's DC5 limit stillenabled.\n");
drivers/gpu/drm/i915/display/intel_display_power_well.c +20
-0+ +drm_WARN_ONCE (&dev_priv->drm, + (intel_de_read (dev_priv,DC_STATE_EN ) & +DC_STATE_EN_UPTO_DC5 ), +"DC5 already programmed to be enabled.\n" ); +assert_rpm_wakelock_held (&dev_priv->runtime_pm); + +assert_dmc_loaded (dev_priv); +} + +void gen9_enable_dc5 (struct drm_i915_private *dev_priv) +{ +assert_can_enable_dc5 (dev_priv); + +drm_dbg_kms (&dev_priv->drm,"Enabling DC5\n" ); + +/* Wa Display #1183: skl,kbl,cfl */ +if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv)) + intel_de_write(dev_priv, GEN8_CHICKEN_DCPR_1, + intel_de_read(dev_priv,
GEN8_CHICKEN_DCPR_1) |SKL_SELECT_ALTERNATE_DC_EXIT);drivers/gpu/drm/i915/display/intel_display_power_well.c +8
-0+ +gen9_set_dc_state (dev_priv,DC_STATE_EN_UPTO_DC5 ); +} + +static void assert_can_enable_dc6 (struct drm_i915_private *dev_priv) +{ + drm_WARN_ONCE(&dev_priv->drm, + intel_de_read(dev_priv, UTIL_PIN_CTL) &
UTIL_PIN_ENABLE,drivers/gpu/drm/i915/display/intel_display_power_well.c +19
-0+ "Backlight is not disabled.\n"); +drm_WARN_ONCE (&dev_priv->drm, + (intel_de_read (dev_priv,DC_STATE_EN ) & +DC_STATE_EN_UPTO_DC6 ), +"DC6 already programmed to be enabled.\n" ); + +assert_dmc_loaded (dev_priv); +} + +void skl_enable_dc6 (struct drm_i915_private *dev_priv) +{ +assert_can_enable_dc6 (dev_priv); + +drm_dbg_kms (&dev_priv->drm,"Enabling DC6\n" ); + +/* Wa Display #1183: skl,kbl,cfl */ +if (DISPLAY_VER (dev_priv) ==9 && !IS_BROXTON (dev_priv)) + intel_de_write(dev_priv, GEN8_CHICKEN_DCPR_1, + intel_de_read(dev_priv,
GEN8_CHICKEN_DCPR_1) |SKL_SELECT_ALTERNATE_DC_EXIT);drivers/gpu/drm/i915/display/intel_display_power_well.c +31
-0+ +gen9_set_dc_state (dev_priv,DC_STATE_EN_UPTO_DC6 ); +} + +void bxt_enable_dc9 (struct drm_i915_private *dev_priv) +{ +assert_can_enable_dc9 (dev_priv); + +drm_dbg_kms (&dev_priv->drm,"Enabling DC9\n" ); +/* +* Power sequencer reset is not needed on +* platforms with South Display Engine on PCH, +* because PPS registers are always on. +*/ +if (!HAS_PCH_SPLIT (dev_priv)) +intel_pps_reset_all (dev_priv); +gen9_set_dc_state (dev_priv,DC_STATE_EN_DC9 ); +} + +void bxt_disable_dc9 (struct drm_i915_private *dev_priv) +{ +assert_can_disable_dc9 (dev_priv); + +drm_dbg_kms (&dev_priv->drm,"Disabling DC9\n" ); + +gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); + +intel_pps_unlock_regs_wa (dev_priv); +} + +static void hsw_power_well_sync_hw(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+ struct i915_power_well *power_well) +{ + const struct i915_power_well_regs *regs = power_well->desc-Quoted 1 line
ops->regs;drivers/gpu/drm/i915/display/intel_display_power_well.c +10
-0+int pw_idx = power_well->desc->hsw.idx; +u32 mask =HSW_PWR_WELL_CTL_REQ (pw_idx); +u32 bios_req =intel_de_read (dev_priv, regs->bios); + +/* Take over the request bit if set by BIOS. */ +if (bios_req & mask) { +u32 drv_req =intel_de_read (dev_priv, regs->driver); + +if (!(drv_req & mask)) + intel_de_write(dev_priv, regs->driver, drv_req| mask);
drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+intel_de_write (dev_priv, regs->bios, bios_req & ~mask); + } +} + +static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+{ +bxt_ddi_phy_init (dev_priv, power_well->desc->bxt.phy); +} + +static void bxt_dpio_cmn_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+{ +bxt_ddi_phy_uninit (dev_priv, power_well->desc->bxt.phy); +} + +static bool bxt_dpio_cmn_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+{ + return bxt_ddi_phy_is_enabled(dev_priv, power_well->desc-Quoted 1 line
bxt.phy);
drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+} + +static void bxt_verify_ddi_phy_power_wells(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+{ +struct i915_power_well *power_well; + + power_well = lookup_power_well(dev_priv,
BXT_DISP_PW_DPIO_CMN_A);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+if (intel_power_well_refcount (power_well) >0 ) + bxt_ddi_phy_verify_state(dev_priv, power_well->desc-Quoted 1 line
bxt.phy);
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+ + power_well = lookup_power_well(dev_priv,
VLV_DISP_PW_DPIO_CMN_BC);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+if (intel_power_well_refcount (power_well) >0 ) + bxt_ddi_phy_verify_state(dev_priv, power_well->desc-Quoted 1 line
bxt.phy);
drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+ +if (IS_GEMINILAKE (dev_priv)) { + power_well =lookup_power_well (dev_priv, +GLK_DISP_PW_DPIO_CMN_C ); +if (intel_power_well_refcount (power_well) >0 ) + bxt_ddi_phy_verify_state(dev_priv, + power_well->desc-Quoted 1 line
bxt.phy);
drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+ } +} + +static bool gen9_dc_off_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+{ + return ((intel_de_read(dev_priv, DC_STATE_EN) &
DC_STATE_EN_DC3CO) == 0 &&drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ (intel_de_read(dev_priv, DC_STATE_EN) &
DC_STATE_EN_UPTO_DC5_DC6_MASK) == 0);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+} + +static void gen9_assert_dbuf_enabled(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+{ + u8 hw_enabled_dbuf_slices =
intel_enabled_dbuf_slices_mask(dev_priv);drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+u8 enabled_dbuf_slices = dev_priv->dbuf.enabled_slices; + + drm_WARN(&dev_priv->drm, + hw_enabled_dbuf_slices != enabled_dbuf_slices, + "Unexpected DBuf power power state (0x%08x, expected0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +20
-0+ hw_enabled_dbuf_slices, + enabled_dbuf_slices); +} + +void gen9_disable_dc_states (struct drm_i915_private *dev_priv) +{ +struct intel_cdclk_config cdclk_config = {}; + +if (dev_priv->dmc.target_dc_state ==DC_STATE_EN_DC3CO ) { +tgl_disable_dc3co (dev_priv); +return ; + } + +gen9_set_dc_state (dev_priv,DC_STATE_DISABLE ); + +if (!HAS_DISPLAY (dev_priv)) +return ; + +intel_cdclk_get_cdclk (dev_priv, &cdclk_config); +/* Can't read out voltage_level so can't use
intel_cdclk_changed()*/drivers/gpu/drm/i915/display/intel_display_power_well.c +12
-0+drm_WARN_ON (&dev_priv->drm, +intel_cdclk_needs_modeset (&dev_priv->cdclk.hw, + &cdclk_config)); + +gen9_assert_dbuf_enabled (dev_priv); + +if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) +bxt_verify_ddi_phy_power_wells (dev_priv); + +if (DISPLAY_VER (dev_priv) >=11 ) +/* +* DMC retains HW context only for port A, the other combo
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* PHY's HW context for port B is lost after DC transitions,
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+* so we need to restore it manually. +*/ +intel_combo_phy_init (dev_priv); +} + +static void gen9_dc_off_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+{ +gen9_disable_dc_states (dev_priv); +} + +static void gen9_dc_off_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +18
-0+{ +if (!intel_dmc_has_payload (dev_priv)) +return ; + +switch (dev_priv->dmc.target_dc_state) { +case DC_STATE_EN_DC3CO : +tgl_enable_dc3co (dev_priv); +break ; +case DC_STATE_EN_UPTO_DC6 : +skl_enable_dc6 (dev_priv); +break ; +case DC_STATE_EN_UPTO_DC5 : +gen9_enable_dc5 (dev_priv); +break ; + } +} + +static void i9xx_power_well_sync_hw_noop(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+{ +} + +static void i9xx_always_on_power_well_noop(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+{ +} + +static bool i9xx_always_on_power_well_enabled(struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+{ +return true; +} + +static void i830_pipes_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+{ + if ((intel_de_read(dev_priv, PIPECONF(PIPE_A)) &
PIPECONF_ENABLE) == 0)drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+i830_enable_pipe (dev_priv,PIPE_A ); + if ((intel_de_read(dev_priv, PIPECONF(PIPE_B)) &
PIPECONF_ENABLE) == 0)drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+i830_enable_pipe (dev_priv,PIPE_B ); +} + +static void i830_pipes_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+{ +i830_disable_pipe (dev_priv,PIPE_B ); +i830_disable_pipe (dev_priv,PIPE_A ); +} + +static bool i830_pipes_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+{ + return intel_de_read(dev_priv, PIPECONF(PIPE_A)) &
PIPECONF_ENABLE&&drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+ intel_de_read(dev_priv, PIPECONF(PIPE_B)) &
PIPECONF_ENABLE;drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+} + +static void i830_pipes_power_well_sync_hw(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +9
-0+{ +if (intel_power_well_refcount (power_well) >0 ) +i830_pipes_power_well_enable (dev_priv, power_well); +else +i830_pipes_power_well_disable (dev_priv, power_well); +} + +static void vlv_set_power_well (struct drm_i915_private *dev_priv, + struct i915_power_well *power_well, boolenable)
drivers/gpu/drm/i915/display/intel_display_power_well.c +14
-0+{ +int pw_idx = power_well->desc->vlv.idx; +u32 mask; +u32 state; +u32 ctrl; + + mask =PUNIT_PWRGT_MASK (pw_idx); + state = enable ?PUNIT_PWRGT_PWR_ON (pw_idx) : +PUNIT_PWRGT_PWR_GATE (pw_idx); + +vlv_punit_get (dev_priv); + +#define COND \ + ((vlv_punit_read(dev_priv, PUNIT_REG_PWRGT_STATUS) & mask) ==state)
drivers/gpu/drm/i915/display/intel_display_power_well.c +12
-0+ +if (COND ) + goto out; + + ctrl =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL ); + ctrl &= ~mask; + ctrl |= state; +vlv_punit_write (dev_priv,PUNIT_REG_PWRGT_CTRL , ctrl); + +if (wait_for (COND ,100 )) + drm_err(&dev_priv->drm, + "timeout setting power well state %08x(%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+ state, + vlv_punit_read(dev_priv,
PUNIT_REG_PWRGT_CTRL));drivers/gpu/drm/i915/display/intel_display_power_well.c +14
-0+ +#undef COND + +out: +vlv_punit_put (dev_priv); +} + +static void vlv_power_well_enable (struct drm_i915_private *dev_priv, +struct i915_power_well *power_well) +{ +vlv_set_power_well (dev_priv, power_well, true); +} + +static void vlv_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+ struct i915_power_well *power_well) +{ +vlv_set_power_well (dev_priv, power_well, false); +} + +static bool vlv_power_well_enabled(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +14
-0+ struct i915_power_well *power_well) +{ +int pw_idx = power_well->desc->vlv.idx; +bool enabled = false; +u32 mask; +u32 state; +u32 ctrl; + + mask =PUNIT_PWRGT_MASK (pw_idx); + ctrl =PUNIT_PWRGT_PWR_ON (pw_idx); + +vlv_punit_get (dev_priv); + + state = vlv_punit_read(dev_priv, PUNIT_REG_PWRGT_STATUS) &mask;
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+/* +* We only ever set the power-on and power-gate states, anything
drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0+* else is unexpected. +*/ + drm_WARN_ON(&dev_priv->drm, state != PUNIT_PWRGT_PWR_ON(pw_idx)&&
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0+ state != PUNIT_PWRGT_PWR_GATE(pw_idx)); +if (state == ctrl) + enabled = true; + +/* +* A transient state at this point would mean some unexpected party
drivers/gpu/drm/i915/display/intel_display_power_well.c +11
-0+* is poking at the power controls too. +*/ + ctrl =vlv_punit_read (dev_priv,PUNIT_REG_PWRGT_CTRL ) & mask; +drm_WARN_ON (&dev_priv->drm, ctrl != state); + +vlv_punit_put (dev_priv); + +return enabled; +} + +static void vlv_init_display_clock_gating(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+{ +u32 val; + +/* +* On driver load, a pipe may be active and driving a DSI display.
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* Preserve DPOUNIT_CLOCK_GATE_DISABLE to avoid the pipe getting stuck
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* (and never recovering) in this case.
intel_dsi_post_disable()willdrivers/gpu/drm/i915/display/intel_display_power_well.c +15
-0+* clear it when we turn off the display. +*/ + val =intel_de_read (dev_priv,DSPCLK_GATE_D ); + val &=DPOUNIT_CLOCK_GATE_DISABLE ; + val |=VRHUNIT_CLOCK_GATE_DISABLE ; +intel_de_write (dev_priv,DSPCLK_GATE_D , val); + +/* +* Disable trickle feed and enable pnd deadline calculation +*/ +intel_de_write (dev_priv,MI_ARB_VLV , +MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE ); +intel_de_write (dev_priv,CBR1_VLV ,0 ); + + drm_WARN_ON(&dev_priv->drm, RUNTIME_INFO(dev_priv)->rawclk_freq== 0);
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0+ intel_de_write(dev_priv, RAWCLK_FREQ_VLV, + DIV_ROUND_CLOSEST(RUNTIME_INFO(dev_priv)-Quoted 1 line
rawclk_freq,drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0+ 1000)); +} + +static void vlv_display_power_well_init(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power_well.c +30
-0+{ +struct intel_encoder *encoder; +enum pipe pipe; + +/* +* Enable the CRI clock source so we can get at the +* display and the reference clock for VGA +* hotplug / manual detection. Supposedly DSI also +* needs the ref clock up and running. +* +* CHV DPLL B/C have some issues if VGA mode is enabled. +*/ +for_each_pipe (dev_priv, pipe) { +u32 val =intel_de_read (dev_priv,DPLL (pipe)); + + val |=DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ; +if (pipe !=PIPE_A ) + val |=DPLL_INTEGRATED_CRI_CLK_VLV ; + +intel_de_write (dev_priv,DPLL (pipe), val); + } + +vlv_init_display_clock_gating (dev_priv); + +spin_lock_irq (&dev_priv->irq_lock); +valleyview_enable_display_irqs (dev_priv); +spin_unlock_irq (&dev_priv->irq_lock); + +/* +* During driver initialization/resume we can avoid restoring the
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+* part of the HW/SW state that will be inited anyway explicitly.
drivers/gpu/drm/i915/display/intel_display_power_well.c +19
-0+*/ +if (dev_priv->power_domains.initializing) +return ; + +intel_hpd_init (dev_priv); +intel_hpd_poll_disable (dev_priv); + +/* Re-enable the ADPA, if we have one */ +for_each_intel_encoder (&dev_priv->drm, encoder) { +if (encoder->type ==INTEL_OUTPUT_ANALOG ) +intel_crt_reset (&encoder->base); + } + +intel_vga_redisable_power_on (dev_priv); + +intel_pps_unlock_regs_wa (dev_priv); +} + +static void vlv_display_power_well_deinit(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/display/intel_display_power_well.c +11
-0+{ +spin_lock_irq (&dev_priv->irq_lock); +valleyview_disable_display_irqs (dev_priv); +spin_unlock_irq (&dev_priv->irq_lock); + +/* make sure we're done processing display irqs */ +intel_synchronize_irq (dev_priv); + +intel_pps_reset_all (dev_priv); + +/* Prevent us from re-enabling polling on accident in late suspend */
drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0+if (!dev_priv->drm.dev->power.is_suspended) +intel_hpd_poll_enable (dev_priv); +} + +static void vlv_display_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+{ +vlv_set_power_well (dev_priv, power_well, true); + +vlv_display_power_well_init (dev_priv); +} + +static void vlv_display_power_well_disable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0+{ +vlv_display_power_well_deinit (dev_priv); + +vlv_set_power_well (dev_priv, power_well, false); +} + +static void vlv_dpio_cmn_power_well_enable(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0+struct i915_power_well
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +19
-0+{ +/* since ref/cri clock was enabled */ +udelay (1 );/* >10ns for cmnreset, >0ns for sidereset */ + +vlv_set_power_well (dev_priv, power_well, true); + +/* +* From VLV2A0_DP_eDP_DPIO_driver_vbios_notes_10.docx - +* 6. De-assert cmn_reset/side_reset. Same as VLV X0. +* a. GUnit 0x2110 bit[0] set to 1 (def 0) +* b. The other bits such as sfr settings / modesel may all +* be set to 0. Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CMNRST);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
~DPIO_CMNRST);
drivers/gpu/drm/i915/display/intel_display_power_well.c +27
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0) |drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0, 0) |drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0, 1) |drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1) |drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1, 0) |drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1, 1));drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0) |drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0, 0) |drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0, 1));drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*/
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0)) == 0)drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_PHY0,DPIO_CH0);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1)) == 0)drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_PHY0,DPIO_CH1);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*/
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0) |drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1)))drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
usage
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
channel
drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1)) &&drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPLL_VCO_ENABLE) == 0)drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0, 0);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0, 1);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1)))drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1, 0);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1)))drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH1, 1);drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*/
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0)) == 0)drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_PHY1,DPIO_CH0);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0, 0);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0)))drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DPIO_CH0, 1);drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
whatnot,
drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
10))
drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(PHY_CONTROL=0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
phy_status_mask,drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
VLV_DISP_PW_DPIO_CMN_BC&&drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
CHV_DISP_PW_DPIO_CMN_D);drivers/gpu/drm/i915/display/intel_display_power_well.c +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
up\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +39
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
VLV_DISP_PW_DPIO_CMN_BC&&drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
CHV_DISP_PW_DPIO_CMN_D);drivers/gpu/drm/i915/display/intel_display_power_well.c +21
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
asserts */
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv, enumdpio_phyphy,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
override, unsigned int mask)
drivers/gpu/drm/i915/display/intel_display_power_well.c +25
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
disabled.
drivers/gpu/drm/i915/display/intel_display_power_well.c +30
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Expected: all %d, any %d. (0x%x = 0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
dpio_phyphy,drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 1 line
power_domains;drivers/gpu/drm/i915/display/intel_display_power_well.c +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
~PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(DPIO_PHY_CONTROL=0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +15
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 1 line
power_domains;drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
vlv_dig_port_to_phy(enc_to_dig_port(encoder));
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
vlv_dig_port_to_channel(enc_to_dig_port(encoder));
drivers/gpu/drm/i915/display/intel_display_power_well.c +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
ch);
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
ch);
drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
~PHY_CH_POWER_DOWN_OVRD_EN(phy, ch);
drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(PHY_CONTROL=0x%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DP_SSS_MASK(pipe);drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
anything
drivers/gpu/drm/i915/display/intel_display_power_well.c +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
party
drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DP_SSC_MASK(pipe);drivers/gpu/drm/i915/display/intel_display_power_well.c +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +13
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DP_SSS_MASK(pipe)) == state)drivers/gpu/drm/i915/display/intel_display_power_well.c +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(%08x)\n",
drivers/gpu/drm/i915/display/intel_display_power_well.c +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +7
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +18
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
TGL_PCODE_EXIT_TCCOLD_DATA_L_BLOCK_REQ;drivers/gpu/drm/i915/display/intel_display_power_well.c +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
TGL_PCODE_EXIT_TCCOLD_DATA_L_UNBLOCK_REQ;drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
200us
drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
&high_val);drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
TGL_PCODE_EXIT_TCCOLD_DATA_L_EXIT_FAILED))drivers/gpu/drm/i915/display/intel_display_power_well.c +45
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_well)drivers/gpu/drm/i915/display/intel_display_power_well.c +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
read it
drivers/gpu/drm/i915/display/intel_display_power_well.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
errors
drivers/gpu/drm/i915/display/intel_display_power_well.c +117
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_display_power_well.h +0
-11Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
state, for
drivers/gpu/drm/i915/display/intel_display_power_well.h +0
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Called
drivers/gpu/drm/i915/display/intel_display_power_well.h +0
-1Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
calling
drivers/gpu/drm/i915/display/intel_display_power_well.h +0
-7Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
refcount
drivers/gpu/drm/i915/display/intel_display_power_well.h +0
-6Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
after
drivers/gpu/drm/i915/display/intel_display_power_well.h +3
-9Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
dpio_phyphy,drivers/gpu/drm/i915/display/intel_display_power_well.h +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
state);
drivers/gpu/drm/i915/display/intel_display_power_well.h +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
i9xx_always_on_power_well_ops;drivers/gpu/drm/i915/display/intel_display_power_well.h +13
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_dpio_phy.c +1
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_pps.c +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH v3 2/18 drm/i915: Unexport the for_each_power_well() macros
In reply to Imre DeakThe for_each_power_well() macros are only used in intel_display_power.c and intel_display_power_well.c, so unexport them.
--- .../drm/i915/display/intel_display_power.c | 8 ++++++++ .../drm/i915/display/intel_display_power.h | 20 ------------------- .../i915/display/intel_display_power_well.h | 12 +++++++++++ 3 files changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +8 -0
@@ -21,6 +21,14 @@#include "intel_snps_phy.h" #include "vlv_sideband.h" +#define for_each_power_domain_well (__dev_priv, __power_well, __domain_mask) \ + for_each_power_well(__dev_priv, __power_well) \ + for_each_if((__power_well)->desc->domains & (__domain_mask)) + +#define for_each_power_domain_well_reverse (__dev_priv, __power_well, __domain_mask) \ + for_each_power_well_reverse(__dev_priv, __power_well) \ + for_each_if((__power_well)->desc->domains & (__domain_mask)) +const char *intel_display_power_domain_str (enum intel_display_power_domain domain) {
drivers/gpu/drm/i915/display/intel_display_power.h +0 -20
@@ -172,26 +172,6 @@ struct intel_display_power_domain_set {for ((domain) =0 ; (domain) <POWER_DOMAIN_NUM ; (domain)++) \ for_each_if(BIT_ULL(domain) & (mask)) -#define for_each_power_well (__dev_priv, __power_well) \ - for ((__power_well) = (__dev_priv)->power_domains.power_wells; \ - (__power_well) - (__dev_priv)->power_domains.power_wells < \ - (__dev_priv)->power_domains.power_well_count; \ - (__power_well)++) - -#define for_each_power_well_reverse (__dev_priv, __power_well) \ - for ((__power_well) = (__dev_priv)->power_domains.power_wells + \ - (__dev_priv)->power_domains.power_well_count - 1; \ - (__power_well) - (__dev_priv)->power_domains.power_wells >= 0; \ - (__power_well)--) - -#define for_each_power_domain_well (__dev_priv, __power_well, __domain_mask) \ - for_each_power_well(__dev_priv, __power_well) \ - for_each_if((__power_well)->desc->domains & (__domain_mask)) - -#define for_each_power_domain_well_reverse (__dev_priv, __power_well, __domain_mask) \ - for_each_power_well_reverse(__dev_priv, __power_well) \ - for_each_if((__power_well)->desc->domains & (__domain_mask)) -int intel_power_domains_init (struct drm_i915_private *dev_priv);void intel_power_domains_cleanup (struct drm_i915_private *dev_priv);void intel_power_domains_init_hw (struct drm_i915_private *dev_priv,bool resume);
drivers/gpu/drm/i915/display/intel_display_power_well.h +12 -0
@@ -12,6 +12,18 @@struct drm_i915_private ;struct i915_power_well ; +#define for_each_power_well (__dev_priv, __power_well) \ + for ((__power_well) = (__dev_priv)->power_domains.power_wells; \ + (__power_well) - (__dev_priv)->power_domains.power_wells < \ + (__dev_priv)->power_domains.power_well_count; \ + (__power_well)++) + +#define for_each_power_well_reverse (__dev_priv, __power_well) \ + for ((__power_well) = (__dev_priv)->power_domains.power_wells + \ + (__dev_priv)->power_domains.power_well_count - 1; \ + (__power_well) - (__dev_priv)->power_domains.power_wells >= 0; \ + (__power_well)--) +/* * i915_power_well_id: *
Signature · 1 line
2.30.2
PATCH v3 3/18 drm/i915: Move the power domain->well mappings to intel_display_power_map.c
In reply to Imre DeakMove the list of platform specific power domain -> power well definitions to intel_display_power_map.c. While at it group the platforms' power domain macros with the corresponding power well lists and keep all the power domain lists in the same order (matching the enum order).
No functional changes.
v2:
- s/intel_display_power_internal.h/intel_display_power_map.h/ (Jani)
- Simplify intel_cleanup_power_wells().
- Don't move intel_display_power_domain_str().
v3:
- Rename intel_init/cleanup_power_wells() to intel_display_power_map_init/cleanup().
- Add documentation to intel_display_power_map_init/cleanup().
--- drivers/gpu/drm/i915/Makefile | 1 + .../drm/i915/display/intel_display_power.c | 2260 +---------------- .../i915/display/intel_display_power_map.c | 2150 ++++++++++++++++ .../i915/display/intel_display_power_map.h | 14 + 4 files changed, 2168 insertions(+), 2257 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -216,6 +216,7 @@ i915-y += \ display/intel_cursor.o \ display/intel_display.o \ display/intel_display_power.o \ + display/intel_display_power_map.o \ display/intel_display_power_well.o \ display/intel_dmc.o \ display/intel_dpio_phy.o \
drivers/gpu/drm/i915/display/intel_display_power.c +3 -2257
2,296 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_map.c new file +2150 -0
697 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_map.h new file +14 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.30.2
Part of the diff is not shown here. View the raw message.
Re: [Intel-gfx] [PATCH v3 03/18] drm/i915: Move the power domain->well mappings to intel_display_power_map.c
Quoted 9 lines · Imre Deak
Move the list of platform specific power domain -> power well definitions to
intel_display_power_map.c. While at it group the platforms' power domain macros with the corresponding power well lists
and keep all the power domain lists in the same order (matching the enum
order).No functional changes.
Quoted 4,664 lines
v2:
- s/intel_display_power_internal.h/intel_display_power_map.h/ (Jani)
- Simplifyintel_cleanup_power_wells().
- Don't moveintel_display_power_domain_str().
v3:
- Rename intel_init/cleanup_power_wells() to intel_display_power_map_init/cleanup().
- Add documentation to intel_display_power_map_init/cleanup().Cc Jani Nikula <[email protected]>Signed-off-by Imre Deak <[email protected]>Reviewed-by Jouni Högander <[email protected]> (v2)--- drivers/gpu/drm/i915/Makefile | 1 + .../drm/i915/display/intel_display_power.c | 2260 +------------ ---- .../i915/display/intel_display_power_map.c | 2150 ++++++++++++++++ .../i915/display/intel_display_power_map.h | 14 + 4 files changed, 2168 insertions(+), 2257 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_power_map.c create mode 100644
drivers/gpu/drm/i915/display/intel_display_power_map.hdrivers/gpu/drm/i915/Makefile +1
-0@@ -216,6 +216,7 @@ i915-y += \ display/intel_cursor.o \ display/intel_display.o \ display/intel_display_power.o \ + display/intel_display_power_map.o \ display/intel_display_power_well.o \ display/intel_dmc.o \ display/intel_dpio_phy.o \drivers/gpu/drm/i915/display/intel_display_power.c +1
-259@@ -11,6 +11,7 @@#include "intel_combo_phy.h" #include "intel_de.h" #include "intel_display_power.h" +#include "intel_display_power_map.h" #include "intel_display_power_well.h" #include "intel_display_types.h" #include "intel_dmc.h" @@ -848,2169 +849,6 @@ intel_display_power_put_mask_in_set(struct drm_i915_private *i915, } } -#define I830_PIPES_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_A) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define VLV_DISPLAY_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_DISPLAY_CORE) | \ - BIT_ULL(POWER_DOMAIN_PIPE_A) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DSI) | \ - BIT_ULL(POWER_DOMAIN_PORT_CRT) | \ - BIT_ULL(POWER_DOMAIN_VGA) | \ - 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) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define VLV_DPIO_CMN_BC_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_CRT) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define CHV_DISPLAY_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_DISPLAY_CORE) | \ - BIT_ULL(POWER_DOMAIN_PIPE_A) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DSI) | \ - BIT_ULL(POWER_DOMAIN_VGA) | \ - 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) | \ - BIT_ULL(POWER_DOMAIN_GMBUS) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define CHV_DPIO_CMN_BC_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define CHV_DPIO_CMN_D_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_D) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define HSW_DISPLAY_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - 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_MMIO ) | \ -BIT_ULL (POWER_DOMAIN_AUDIO_PLAYBACK ) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define BDW_DISPLAY_POWER_DOMAINS ( \ -BIT_ULL (POWER_DOMAIN_PIPE_B ) | \ -BIT_ULL (POWER_DOMAIN_PIPE_C ) | \ -BIT_ULL (POWER_DOMAIN_PIPE_B_PANEL_FITTER ) | \ -BIT_ULL (POWER_DOMAIN_PIPE_C_PANEL_FITTER ) | \ -BIT_ULL (POWER_DOMAIN_TRANSCODER_A ) | \ -BIT_ULL (POWER_DOMAIN_TRANSCODER_B ) | \ -BIT_ULL (POWER_DOMAIN_TRANSCODER_C ) | \ -BIT_ULL (POWER_DOMAIN_PORT_DDI_B_LANES ) | \ -BIT_ULL (POWER_DOMAIN_PORT_DDI_C_LANES ) | \ -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_MMIO ) | \ -BIT_ULL (POWER_DOMAIN_AUDIO_PLAYBACK ) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_E_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_AUX_D) | \ - 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 ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_E_IO) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define SKL_DISPLAY_DDI_IO_B_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define SKL_DISPLAY_DDI_IO_C_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_IO) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define SKL_DISPLAY_DDI_IO_D_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_D_IO) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define SKL_DISPLAY_DC_OFF_POWER_DOMAINS ( \ - SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_GT_IRQ) | \ - BIT_ULL(POWER_DOMAIN_MODESET) | \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - 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_MMIO) | \ - BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) | \ - BIT_ULL(POWER_DOMAIN_VGA) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define BXT_DISPLAY_DC_OFF_POWER_DOMAINS ( \ - BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_GT_IRQ) | \ - BIT_ULL(POWER_DOMAIN_MODESET) | \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - BIT_ULL(POWER_DOMAIN_GMBUS) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define BXT_DPIO_CMN_A_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_A_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define BXT_DPIO_CMN_BC_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - 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_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 ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO)) -#define GLK_DISPLAY_DDI_IO_B_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO)) -#define GLK_DISPLAY_DDI_IO_C_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_IO)) -#define GLK_DPIO_CMN_A_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_A_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define GLK_DPIO_CMN_B_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define GLK_DPIO_CMN_C_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define GLK_DISPLAY_AUX_C_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -#define GLK_DISPLAY_DC_OFF_POWER_DOMAINS ( \ - GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_GT_IRQ) | \ - BIT_ULL(POWER_DOMAIN_MODESET) | \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - BIT_ULL(POWER_DOMAIN_GMBUS) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -/* -* ICL PW_0/PG_0 domains (HW/DMC control): -* - PCI -* - clocks except port PLL -* - central power except FBC -* - shared functions except pipe interrupts, pipe MBUS, DBUF registers
- * ICL PW_1/PG_1 domains (HW/DMC control):
- * - DBUF function
- * -PIPE_Aand its planes, except VGA
- * - transcoder EDP + PSR
- * - transcoder DSI
- * -DDI_A
- * - FBC
- */drivers/gpu/drm/i915/display/intel_display_power.c +0
-138-#define ICL_PW_4_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -/* VDSC/joining */ -#define ICL_PW_3_POWER_DOMAINS ( \ - ICL_PW_4_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_E_LANES) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_F_LANES) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_AUX_D) | \ - BIT_ULL(POWER_DOMAIN_AUX_E) | \ - BIT_ULL(POWER_DOMAIN_AUX_F) | \ - BIT_ULL(POWER_DOMAIN_AUX_C_TBT) | \ - BIT_ULL(POWER_DOMAIN_AUX_D_TBT) | \ - BIT_ULL(POWER_DOMAIN_AUX_E_TBT) | \ - BIT_ULL(POWER_DOMAIN_AUX_F_TBT) | \ - BIT_ULL(POWER_DOMAIN_VGA) | \ - BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) | \ - BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -/* -* - transcoder WD -* - KVMR (HW control) -*/ -#define ICL_PW_2_POWER_DOMAINS ( \ - ICL_PW_3_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_VDSC_PW2) | \ - BIT_ULL(POWER_DOMAIN_INIT)) -/* -* - KVMR (HW control) -*/ -#define ICL_DISPLAY_DC_OFF_POWER_DOMAINS ( \ - ICL_PW_2_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_MODESET) | \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - BIT_ULL(POWER_DOMAIN_DC_OFF) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define ICL_DDI_IO_A_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO)) -#define ICL_DDI_IO_B_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO)) -#define ICL_DDI_IO_C_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_C_IO)) -#define ICL_DDI_IO_D_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_D_IO)) -#define ICL_DDI_IO_E_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_E_IO)) -#define ICL_DDI_IO_F_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_F_IO)) - -#define ICL_AUX_A_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ - BIT_ULL(POWER_DOMAIN_AUX_A)) -#define ICL_AUX_B_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_B)) -#define ICL_AUX_C_TC1_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_C)) -#define ICL_AUX_D_TC2_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_D)) -#define ICL_AUX_E_TC3_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_E)) -#define ICL_AUX_F_TC4_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_F)) -#define ICL_AUX_C_TBT1_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_C_TBT)) -#define ICL_AUX_D_TBT2_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_D_TBT)) -#define ICL_AUX_E_TBT3_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_E_TBT)) -#define ICL_AUX_F_TBT4_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_F_TBT)) - -#define TGL_PW_5_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_D) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_D) | \ - BIT_ULL(POWER_DOMAIN_PIPE_D_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define TGL_PW_4_POWER_DOMAINS ( \ - TGL_PW_5_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define TGL_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_PORT_DDI_LANES_TC3) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC4) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC5) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC6) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC1) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC2) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC3) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC4) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC5) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC6) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT1) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT2) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT3) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT4) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT5) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT6) | \ - BIT_ULL(POWER_DOMAIN_VGA) | \ - BIT_ULL(POWER_DOMAIN_AUDIO_MMIO) | \ - BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define TGL_PW_2_POWER_DOMAINS ( \ - TGL_PW_3_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_VDSC_PW2) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define TGL_DISPLAY_DC_OFF_POWER_DOMAINS ( \ - TGL_PW_3_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_MODESET) | \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - BIT_ULL(POWER_DOMAIN_AUX_B) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define TGL_DDI_IO_TC1_POWER_DOMAINS BIT_ULL(POWER_DOMAIN_PORT_DDI_I
O_TC1)
-#defineTGL_DDI_IO_TC2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC2)
-#defineTGL_DDI_IO_TC3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC3)
-#defineTGL_DDI_IO_TC4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC4)
-#defineTGL_DDI_IO_TC5_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC5)
-#defineTGL_DDI_IO_TC6_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC6)drivers/gpu/drm/i915/display/intel_display_power.c +0
-10- -#define TGL_AUX_A_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ - BIT_ULL(POWER_DOMAIN_AUX_A)) -#define TGL_AUX_B_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_B)) -#define TGL_AUX_C_IO_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_C)) - -#define TGL_AUX_IO_USBC1_POWER_DOMAINS BIT_ULL(POWER_DOMAIN_AU
X_USBC1)
-#defineTGL_AUX_IO_USBC2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC2)
-#defineTGL_AUX_IO_USBC3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC3)
-#defineTGL_AUX_IO_USBC4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC4)
-#defineTGL_AUX_IO_USBC5_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC5)
-#defineTGL_AUX_IO_USBC6_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC6)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- -#define TGL_AUX_IO_TBT1_POWER_DOMAINS BIT_ULL(POWER_DOMAIN_AU
X_TBT1)
-#defineTGL_AUX_IO_TBT2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT2)
-#defineTGL_AUX_IO_TBT3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT3)
-#defineTGL_AUX_IO_TBT4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT4)
-#defineTGL_AUX_IO_TBT5_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT5)
-#defineTGL_AUX_IO_TBT6_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT6)drivers/gpu/drm/i915/display/intel_display_power.c +0
-55- -#define TGL_TC_COLD_OFF_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_AUX_USBC1) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC2) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC3) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC4) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC5) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC6) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT1) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT2) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT3) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT4) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT5) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT6) | \ - BIT_ULL(POWER_DOMAIN_TC_COLD_OFF)) - -#define RKL_PW_4_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define RKL_PW_3_POWER_DOMAINS ( \ - RKL_PW_4_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - 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) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC2) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC1) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC2) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -/* -* There is no PW_2/PG_2 on RKL. -* -* RKL PW_1/PG_1 domains (under HW/DMC control): -* - DBUF function (note: registers are in PW0) -* - PIPE_A and its planes and VDSC/joining, except VGA -* - transcoder A -* - DDI_A and DDI_B -* - FBC -* -* RKL PW_0/PG_0 domains (under HW/DMC control): -* - PCI -* - clocks except port PLL -* - shared functions: -* * interrupts except pipe interrupts -* * MBus except PIPE_MBUS_DBOX_CTL -* * DBUF registers -* - central power except FBC -* - top-level GTC (DDI-level GTC is in the well associated with the DDI)
- */drivers/gpu/drm/i915/display/intel_display_power.c +0
-41- -#define RKL_DISPLAY_DC_OFF_POWER_DOMAINS ( \ - RKL_PW_3_POWER_DOMAINS | \ - BIT_ULL(POWER_DOMAIN_MODESET) | \ - BIT_ULL(POWER_DOMAIN_AUX_A) | \ - 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 -* -* Previous platforms required that PG(n-1) be enabled before PG(n). That
- * dependency chain turns into a dependency tree onXE_LPD:
- *
- * PG0
- * |
- * --PG1--
- * / \
- * PGA --PG2--
- * / | \
- * PGB PGC PGD
- *
- * Power wells must be enabled from top to bottom and disabled from bottom
- * to top. This allows pipes to be power gated independently.
- */drivers/gpu/drm/i915/display/intel_display_power.c +0
-65- -#define XELPD_PW_D_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_D) | \ - BIT_ULL(POWER_DOMAIN_PIPE_D_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_D) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define XELPD_PW_C_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_C) | \ - BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define XELPD_PW_B_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_B) | \ - BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define XELPD_PW_A_POWER_DOMAINS ( \ - BIT_ULL(POWER_DOMAIN_PIPE_A) | \ - BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define XELPD_PW_2_POWER_DOMAINS ( \ - XELPD_PW_B_POWER_DOMAINS | \ - XELPD_PW_C_POWER_DOMAINS | \ - XELPD_PW_D_POWER_DOMAINS | \ - 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) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_E_XELPD) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC1) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC2) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC3) | \ - BIT_ULL(POWER_DOMAIN_PORT_DDI_LANES_TC4) | \ - BIT_ULL(POWER_DOMAIN_AUX_C) | \ - BIT_ULL(POWER_DOMAIN_AUX_D_XELPD) | \ - BIT_ULL(POWER_DOMAIN_AUX_E_XELPD) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC1) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC2) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC3) | \ - BIT_ULL(POWER_DOMAIN_AUX_USBC4) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT1) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT2) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT3) | \ - BIT_ULL(POWER_DOMAIN_AUX_TBT4) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -/* -* XELPD PW_1/PG_1 domains (under HW/DMC control): -* - DBUF function (registers are in PW0) -* - Transcoder A -* - DDI_A and DDI_B -* -* XELPD PW_0/PW_1 domains (under HW/DMC control): -* - PCI -* - Clocks except port PLL -* - Shared functions: -* * interrupts except pipe interrupts -* * MBus except PIPE_MBUS_DBOX_CTL -* * DBUF registers -* - Central power except FBC -* - Top-level GTC (DDI-level GTC is in the well associated with the DDI)
- */drivers/gpu/drm/i915/display/intel_display_power.c +0
-11- -#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) | \ - BIT_ULL(POWER_DOMAIN_PORT_DSI) | \ - BIT_ULL(POWER_DOMAIN_INIT)) - -#define XELPD_AUX_IO_D_XELPD_POWER_DOMAINS BIT_ULL(POWER_DOMAIN_AU
X_D_XELPD)
-#defineXELPD_AUX_IO_E_XELPD_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_E_XELPD)
-#defineXELPD_AUX_IO_USBC1_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC1)
-#defineXELPD_AUX_IO_USBC2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC2)
-#defineXELPD_AUX_IO_USBC3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC3)
-#defineXELPD_AUX_IO_USBC4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC4)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- -#define XELPD_AUX_IO_TBT1_POWER_DOMAINS BIT_ULL(POWER_D
OMAIN_AUX_TBT1)
-#defineXELPD_AUX_IO_TBT2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT2)
-#defineXELPD_AUX_IO_TBT3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT3)
-#defineXELPD_AUX_IO_TBT4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT4)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- -#define XELPD_DDI_IO_D_XELPD_POWER_DOMAINS BIT_ULL(POWER_DOMAIN_PO
RT_DDI_IO_D_XELPD)
-#defineXELPD_DDI_IO_E_XELPD_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_E_XELPD)
-#defineXELPD_DDI_IO_TC1_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC1)
-#defineXELPD_DDI_IO_TC2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC2)
-#defineXELPD_DDI_IO_TC3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC3)
-#defineXELPD_DDI_IO_TC4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC4)drivers/gpu/drm/i915/display/intel_display_power.c +0
-2- -static const struct i915_power_well_desc i9xx_always_on_power_well[]= {
drivers/gpu/drm/i915/display/intel_display_power.c +0
-154- { - .name = "always-on", - .always_on = true, - .domains = POWER_DOMAIN_MASK, - .ops = &i9xx_always_on_power_well_ops, - .id = DISP_PW_ID_NONE, - }, -}; - -static const struct i915_power_well_desc i830_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 ="pipes" , - .domains =I830_PIPES_POWER_DOMAINS , - .ops = &i830_pipes_power_well_ops, - .id =DISP_PW_ID_NONE , - }, -}; - -static const struct i915_power_well_desc hsw_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 ="display" , - .domains =HSW_DISPLAY_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =HSW_DISP_PW_GLOBAL , - { - .hsw.idx =HSW_PW_CTL_IDX_GLOBAL , - .hsw.has_vga = true, - }, - }, -}; - -static const struct i915_power_well_desc bdw_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 ="display" , - .domains =BDW_DISPLAY_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =HSW_DISP_PW_GLOBAL , - { - .hsw.idx =HSW_PW_CTL_IDX_GLOBAL , - .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), - .hsw.has_vga = true, - }, - }, -}; - -static const struct i915_power_well_desc vlv_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 ="display" , - .domains =VLV_DISPLAY_POWER_DOMAINS , - .ops = &vlv_display_power_well_ops, - .id =VLV_DISP_PW_DISP2D , - { - .vlv.idx =PUNIT_PWGT_IDX_DISP2D , - }, - }, - { - .name ="dpio-tx-b-01" , - .domains =VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS | -VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS | -VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS | -VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS , - .ops = &vlv_dpio_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_B_LANES_01 , - }, - }, - { - .name ="dpio-tx-b-23" , - .domains =VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS | -VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS | -VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS | -VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS , - .ops = &vlv_dpio_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_B_LANES_23 , - }, - }, - { - .name ="dpio-tx-c-01" , - .domains =VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS | -VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS | -VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS | -VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS , - .ops = &vlv_dpio_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_C_LANES_01 , - }, - }, - { - .name ="dpio-tx-c-23" , - .domains =VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS | -VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS | -VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS | -VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS , - .ops = &vlv_dpio_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_C_LANES_23 , - }, - }, - { - .name ="dpio-common" , - .domains =VLV_DPIO_CMN_BC_POWER_DOMAINS , - .ops = &vlv_dpio_cmn_power_well_ops, - .id =VLV_DISP_PW_DPIO_CMN_BC , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_CMN_BC , - }, - }, -}; - -static const struct i915_power_well_desc chv_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 ="display" , -/* -* Pipe A power well is the new disp2d well. Pipe B and C
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1-* power wells don't actually exist. Pipe A power well is
drivers/gpu/drm/i915/display/intel_display_power.c +0
-1370-* required for any pipe to work. -*/ - .domains = CHV_DISPLAY_POWER_DOMAINS, - .ops = &chv_pipe_power_well_ops, - .id = DISP_PW_ID_NONE, - }, - { - .name = "dpio-common-bc", - .domains = CHV_DPIO_CMN_BC_POWER_DOMAINS, - .ops = &chv_dpio_cmn_power_well_ops, - .id = VLV_DISP_PW_DPIO_CMN_BC, - { - .vlv.idx = PUNIT_PWGT_IDX_DPIO_CMN_BC, - }, - }, - { - .name = "dpio-common-d", - .domains = CHV_DPIO_CMN_D_POWER_DOMAINS, - .ops = &chv_dpio_cmn_power_well_ops, - .id = CHV_DISP_PW_DPIO_CMN_D, - { - .vlv.idx = PUNIT_PWGT_IDX_DPIO_CMN_D, - }, - }, -}; - -static const struct i915_power_well_desc skl_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.idx =SKL_PW_CTL_IDX_PW_1 , - .hsw.has_fuses = true, - }, - }, - { - .name ="MISC IO power well" , -/* Handled by the DMC firmware */ - .always_on = true, - .domains =0 , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_MISC_IO , - { - .hsw.idx =SKL_PW_CTL_IDX_MISC_IO , - }, - }, - { - .name ="DC off" , - .domains =SKL_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 2" , - .domains =SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_2 , - .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), - .hsw.has_vga = true, - .hsw.has_fuses = true, - }, - }, - { - .name ="DDI A/E IO power well" , - .domains =SKL_DISPLAY_DDI_IO_A_E_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_A_E , - }, - }, - { - .name ="DDI B IO power well" , - .domains =SKL_DISPLAY_DDI_IO_B_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_B , - }, - }, - { - .name ="DDI C IO power well" , - .domains =SKL_DISPLAY_DDI_IO_C_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_C , - }, - }, - { - .name ="DDI D IO power well" , - .domains =SKL_DISPLAY_DDI_IO_D_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_D , - }, - }, -}; - -static const struct i915_power_well_desc bxt_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.idx =SKL_PW_CTL_IDX_PW_1 , - .hsw.has_fuses = true, - }, - }, - { - .name ="DC off" , - .domains =BXT_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 2" , - .domains =BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_2 , - .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), - .hsw.has_vga = true, - .hsw.has_fuses = true, - }, - }, - { - .name ="dpio-common-a" , - .domains =BXT_DPIO_CMN_A_POWER_DOMAINS , - .ops = &bxt_dpio_cmn_power_well_ops, - .id =BXT_DISP_PW_DPIO_CMN_A , - { - .bxt.phy =DPIO_PHY1 , - }, - }, - { - .name ="dpio-common-bc" , - .domains =BXT_DPIO_CMN_BC_POWER_DOMAINS , - .ops = &bxt_dpio_cmn_power_well_ops, - .id =VLV_DISP_PW_DPIO_CMN_BC , - { - .bxt.phy =DPIO_PHY0 , - }, - }, -}; - -static const struct i915_power_well_desc glk_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.idx =SKL_PW_CTL_IDX_PW_1 , - .hsw.has_fuses = true, - }, - }, - { - .name ="DC off" , - .domains =GLK_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 2" , - .domains =GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_2 , - .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), - .hsw.has_vga = true, - .hsw.has_fuses = true, - }, - }, - { - .name ="dpio-common-a" , - .domains =GLK_DPIO_CMN_A_POWER_DOMAINS , - .ops = &bxt_dpio_cmn_power_well_ops, - .id =BXT_DISP_PW_DPIO_CMN_A , - { - .bxt.phy =DPIO_PHY1 , - }, - }, - { - .name ="dpio-common-b" , - .domains =GLK_DPIO_CMN_B_POWER_DOMAINS , - .ops = &bxt_dpio_cmn_power_well_ops, - .id =VLV_DISP_PW_DPIO_CMN_BC , - { - .bxt.phy =DPIO_PHY0 , - }, - }, - { - .name ="dpio-common-c" , - .domains =GLK_DPIO_CMN_C_POWER_DOMAINS , - .ops = &bxt_dpio_cmn_power_well_ops, - .id =GLK_DISP_PW_DPIO_CMN_C , - { - .bxt.phy =DPIO_PHY2 , - }, - }, - { - .name ="AUX A" , - .domains =GLK_DISPLAY_AUX_A_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =GLK_PW_CTL_IDX_AUX_A , - }, - }, - { - .name ="AUX B" , - .domains =GLK_DISPLAY_AUX_B_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =GLK_PW_CTL_IDX_AUX_B , - }, - }, - { - .name ="AUX C" , - .domains =GLK_DISPLAY_AUX_C_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =GLK_PW_CTL_IDX_AUX_C , - }, - }, - { - .name ="DDI A IO power well" , - .domains =GLK_DISPLAY_DDI_IO_A_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =GLK_PW_CTL_IDX_DDI_A , - }, - }, - { - .name ="DDI B IO power well" , - .domains =GLK_DISPLAY_DDI_IO_B_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_B , - }, - }, - { - .name ="DDI C IO power well" , - .domains =GLK_DISPLAY_DDI_IO_C_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_C , - }, - }, -}; - -static const struct i915_power_well_desc icl_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.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.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 =ICL_DISP_PW_3 , - { - .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 = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - }, - }, - { - .name ="DDI B IO" , - .domains =ICL_DDI_IO_B_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - }, - }, - { - .name ="DDI C IO" , - .domains =ICL_DDI_IO_C_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_C , - }, - }, - { - .name ="DDI D IO" , - .domains =ICL_DDI_IO_D_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_D , - }, - }, - { - .name ="DDI E IO" , - .domains =ICL_DDI_IO_E_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_E , - }, - }, - { - .name ="DDI F IO" , - .domains =ICL_DDI_IO_F_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_F , - }, - }, - { - .name ="AUX A" , - .domains =ICL_AUX_A_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_A , - }, - }, - { - .name ="AUX B" , - .domains =ICL_AUX_B_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_B , - }, - }, - { - .name ="AUX C TC1" , - .domains =ICL_AUX_C_TC1_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX D TC2" , - .domains =ICL_AUX_D_TC2_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_D , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX E TC3" , - .domains =ICL_AUX_E_TC3_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_E , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX F TC4" , - .domains =ICL_AUX_F_TC4_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_F , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX C TBT1" , - .domains =ICL_AUX_C_TBT1_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_TBT1 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX D TBT2" , - .domains =ICL_AUX_D_TBT2_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_TBT2 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX E TBT3" , - .domains =ICL_AUX_E_TBT3_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_TBT3 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX F TBT4" , - .domains =ICL_AUX_F_TBT4_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_TBT4 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="power well 4" , - .domains =ICL_PW_4_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .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" , - .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.idx =ICL_PW_CTL_IDX_PW_1 , - .hsw.has_fuses = true, - }, - }, - { - .name ="DC off" , - .domains =TGL_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 2" , - .domains =TGL_PW_2_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_2 , - .hsw.has_fuses = true, - }, - }, - { - .name ="power well 3" , - .domains =TGL_PW_3_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =ICL_DISP_PW_3 , - { - .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 = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - } - }, - { - .name ="DDI B IO" , - .domains =ICL_DDI_IO_B_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - } - }, - { - .name ="DDI C IO" , - .domains =ICL_DDI_IO_C_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_C , - } - }, - { - .name ="DDI IO TC1" , - .domains =TGL_DDI_IO_TC1_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , - }, - }, - { - .name ="DDI IO TC2" , - .domains =TGL_DDI_IO_TC2_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC2 , - }, - }, - { - .name ="DDI IO TC3" , - .domains =TGL_DDI_IO_TC3_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC3 , - }, - }, - { - .name ="DDI IO TC4" , - .domains =TGL_DDI_IO_TC4_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC4 , - }, - }, - { - .name ="DDI IO TC5" , - .domains =TGL_DDI_IO_TC5_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC5 , - }, - }, - { - .name ="DDI IO TC6" , - .domains =TGL_DDI_IO_TC6_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC6 , - }, - }, - { - .name ="TC cold off" , - .domains =TGL_TC_COLD_OFF_POWER_DOMAINS , - .ops = &tgl_tc_cold_off_ops, - .id =TGL_DISP_PW_TC_COLD_OFF , - }, - { - .name ="AUX A" , - .domains =TGL_AUX_A_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .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.idx =ICL_PW_CTL_IDX_AUX_B , - }, - }, - { - .name ="AUX C" , - .domains =TGL_AUX_C_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - }, - }, - { - .name ="AUX USBC1" , - .domains =TGL_AUX_IO_USBC1_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .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.idx =TGL_PW_CTL_IDX_AUX_TC2 , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX USBC3" , - .domains =TGL_AUX_IO_USBC3_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC3 , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX USBC4" , - .domains =TGL_AUX_IO_USBC4_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC4 , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX USBC5" , - .domains =TGL_AUX_IO_USBC5_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC5 , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX USBC6" , - .domains =TGL_AUX_IO_USBC6_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC6 , - .hsw.is_tc_tbt = false, - }, - }, - { - .name ="AUX TBT1" , - .domains =TGL_AUX_IO_TBT1_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT1 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX TBT2" , - .domains =TGL_AUX_IO_TBT2_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT2 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX TBT3" , - .domains =TGL_AUX_IO_TBT3_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT3 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX TBT4" , - .domains =TGL_AUX_IO_TBT4_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT4 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX TBT5" , - .domains =TGL_AUX_IO_TBT5_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT5 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX TBT6" , - .domains =TGL_AUX_IO_TBT6_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT6 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="power well 4" , - .domains =TGL_PW_4_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .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.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 rkl_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.idx =ICL_PW_CTL_IDX_PW_1 , - .hsw.has_fuses = true, - }, - }, - { - .name ="DC off" , - .domains =RKL_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 3" , - .domains =RKL_PW_3_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =ICL_DISP_PW_3 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_3 , - .hsw.irq_pipe_mask =BIT (PIPE_B ), - .hsw.has_vga = true, - .hsw.has_fuses = true, - }, - }, - { - .name ="power well 4" , - .domains =RKL_PW_4_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_4 , - .hsw.has_fuses = true, - .hsw.irq_pipe_mask =BIT (PIPE_C ), - } - }, - { - .name ="DDI A IO" , - .domains =ICL_DDI_IO_A_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - } - }, - { - .name ="DDI B IO" , - .domains =ICL_DDI_IO_B_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - } - }, - { - .name ="DDI IO TC1" , - .domains =TGL_DDI_IO_TC1_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , - }, - }, - { - .name ="DDI IO TC2" , - .domains =TGL_DDI_IO_TC2_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC2 , - }, - }, - { - .name ="AUX A" , - .domains =ICL_AUX_A_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_A , - }, - }, - { - .name ="AUX B" , - .domains =ICL_AUX_B_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .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.idx =TGL_PW_CTL_IDX_AUX_TC1 , - }, - }, - { - .name ="AUX USBC2" , - .domains =TGL_AUX_IO_USBC2_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC2 , - }, - }, -}; - -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.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.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.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 = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - } - }, - { - .name ="DDI B IO" , - .domains =ICL_DDI_IO_B_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - } - }, - { - .name ="DDI IO TC1" , - .domains =TGL_DDI_IO_TC1_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , - }, - }, - { - .name ="DDI IO TC2" , - .domains =TGL_DDI_IO_TC2_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .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.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.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.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.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.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.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" , - .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.idx =ICL_PW_CTL_IDX_PW_1 , - .hsw.has_fuses = true, - }, - }, - { - .name ="DC off" , - .domains =XELPD_DISPLAY_DC_OFF_POWER_DOMAINS , - .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , - }, - { - .name ="power well 2" , - .domains =XELPD_PW_2_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_2 , - .hsw.has_vga = true, - .hsw.has_fuses = true, - }, - }, - { - .name ="power well A" , - .domains =XELPD_PW_A_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_PW_A , - .hsw.irq_pipe_mask =BIT (PIPE_A ), - .hsw.has_fuses = true, - }, - }, - { - .name ="power well B" , - .domains =XELPD_PW_B_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_PW_B , - .hsw.irq_pipe_mask =BIT (PIPE_B ), - .hsw.has_fuses = true, - }, - }, - { - .name ="power well C" , - .domains =XELPD_PW_C_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_PW_C , - .hsw.irq_pipe_mask =BIT (PIPE_C ), - .hsw.has_fuses = true, - }, - }, - { - .name ="power well D" , - .domains =XELPD_PW_D_POWER_DOMAINS , - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_PW_D , - .hsw.irq_pipe_mask =BIT (PIPE_D ), - .hsw.has_fuses = true, - }, - }, - { - .name ="DDI A IO" , - .domains =ICL_DDI_IO_A_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - } - }, - { - .name ="DDI B IO" , - .domains =ICL_DDI_IO_B_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - } - }, - { - .name ="DDI C IO" , - .domains =ICL_DDI_IO_C_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_C , - } - }, - { - .name ="DDI IO D_XELPD" , - .domains =XELPD_DDI_IO_D_XELPD_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_DDI_D , - } - }, - { - .name ="DDI IO E_XELPD" , - .domains =XELPD_DDI_IO_E_XELPD_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_DDI_E , - } - }, - { - .name ="DDI IO TC1" , - .domains =XELPD_DDI_IO_TC1_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , - } - }, - { - .name ="DDI IO TC2" , - .domains =XELPD_DDI_IO_TC2_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC2 , - } - }, - { - .name ="DDI IO TC3" , - .domains =XELPD_DDI_IO_TC3_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC3 , - } - }, - { - .name ="DDI IO TC4" , - .domains =XELPD_DDI_IO_TC4_POWER_DOMAINS , - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC4 , - } - }, - { - .name ="AUX A" , - .domains =ICL_AUX_A_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_A , - .hsw.fixed_enable_delay =600 , - }, - }, - { - .name ="AUX B" , - .domains =ICL_AUX_B_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_B , - .hsw.fixed_enable_delay =600 , - }, - }, - { - .name ="AUX C" , - .domains =TGL_AUX_C_IO_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - .hsw.fixed_enable_delay =600 , - }, - }, - { - .name ="AUX D_XELPD" , - .domains =XELPD_AUX_IO_D_XELPD_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_AUX_D , - .hsw.fixed_enable_delay =600 , - }, - }, - { - .name ="AUX E_XELPD" , - .domains =XELPD_AUX_IO_E_XELPD_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_AUX_E , - }, - }, - { - .name ="AUX USBC1" , - .domains =XELPD_AUX_IO_USBC1_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC1 , - .hsw.fixed_enable_delay =600 , - }, - }, - { - .name ="AUX USBC2" , - .domains =XELPD_AUX_IO_USBC2_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC2 , - }, - }, - { - .name ="AUX USBC3" , - .domains =XELPD_AUX_IO_USBC3_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC3 , - }, - }, - { - .name ="AUX USBC4" , - .domains =XELPD_AUX_IO_USBC4_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC4 , - }, - }, - { - .name ="AUX TBT1" , - .domains =XELPD_AUX_IO_TBT1_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT1 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX TBT2" , - .domains =XELPD_AUX_IO_TBT2_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT2 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX TBT3" , - .domains =XELPD_AUX_IO_TBT3_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT3 , - .hsw.is_tc_tbt = true, - }, - }, - { - .name ="AUX TBT4" , - .domains =XELPD_AUX_IO_TBT4_POWER_DOMAINS , - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT4 , - .hsw.is_tc_tbt = true, - }, - }, -}; -static int sanitize_disable_power_well_option(const struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/display/intel_display_power.c +0
-37int disable_power_well)@@ -3089,57 +927,6 @@ static u32 get_allowed_dc_mask(const structdrm_i915_private *dev_priv, return mask; } -static int -__set_power_wells(struct i915_power_domains *power_domains, - const struct i915_power_well_desc *power_well_descs, - int power_well_descs_sz, u64 skip_mask) -{ - struct drm_i915_private *i915 = container_of(power_domains, - struct drm_i915_private, - power_domains); - u64 power_well_ids = 0; - int power_well_count = 0; - int i, plt_idx = 0; - - for (i = 0; i < power_well_descs_sz; i++) - if (!(BIT_ULL(power_well_descs[i].id) & skip_mask)) - power_well_count++; - - power_domains->power_well_count = power_well_count; - power_domains->power_wells = - kcalloc(power_well_count, - sizeof(*power_domains- >power_wells), - GFP_KERNEL); - if (!power_domains->power_wells) - return -ENOMEM; - - for (i = 0; i < power_well_descs_sz; i++) { - enum i915_power_well_id id = power_well_descs[i].id; - - if (BIT_ULL(id) & skip_mask) - continue; - - power_domains->power_wells[plt_idx++].desc = - &power_well_descs[i]; - - if (id == DISP_PW_ID_NONE) - continue; - - drm_WARN_ON(&i915->drm, id >= sizeof(power_well_ids) *8);
drivers/gpu/drm/i915/display/intel_display_power.c +0
-8-drm_WARN_ON (&i915->drm, power_well_ids &BIT_ULL (id)); - power_well_ids |=BIT_ULL (id); - } - -return 0 ; -} - -#define set_power_wells_mask(power_domains, __power_well_descs,
skip_mask) \drivers/gpu/drm/i915/display/intel_display_power.c +0
-6-__set_power_wells (power_domains, __power_well_descs, \ - ARRAY_SIZE(__power_well_descs), skip_mask) - -#define set_power_wells (power_domains, __power_well_descs) \ - set_power_wells_mask(power_domains, __power_well_descs, 0) -/** * intel_power_domains_init - initializes the power domain structures
* @dev_priv: i915 device instancedrivers/gpu/drm/i915/display/intel_display_power.c +0
-1@@ -3150,7 +937,6 @@ __set_power_wells(struct i915_power_domains *power_domains, int intel_power_domains_init(struct drm_i915_private *dev_priv) {struct i915_power_domains *power_domains = &dev_priv- >power_domains; -int err;drivers/gpu/drm/i915/display/intel_display_power.c +0
-14dev_priv->params.disable_power_well = sanitize_disable_power_well_option(dev_priv,@@ -3168,47 +954,7 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) INIT_DELAYED_WORK(&power_domains->async_put_work, intel_display_power_put_async_work); -/* -* The enabling order will be from lower to higher indexed wells, -* the disabling order is reversed. -*/ -if (!HAS_DISPLAY (dev_priv)) { - power_domains->power_well_count =0 ; - err =0 ; - }else if (DISPLAY_VER (dev_priv) >=13 ) { - err =set_power_wells (power_domains, xelpd_power_wells); - }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));
drivers/gpu/drm/i915/display/intel_display_power.c +0
-24- }else if (IS_ROCKETLAKE (dev_priv)) { - err =set_power_wells (power_domains, rkl_power_wells); - }else if (DISPLAY_VER (dev_priv) ==12 ) { - err =set_power_wells (power_domains, tgl_power_wells); - }else if (DISPLAY_VER (dev_priv) ==11 ) { - err =set_power_wells (power_domains, icl_power_wells); - }else if (IS_GEMINILAKE (dev_priv)) { - err =set_power_wells (power_domains, glk_power_wells); - }else if (IS_BROXTON (dev_priv)) { - err =set_power_wells (power_domains, bxt_power_wells); - }else if (DISPLAY_VER (dev_priv) ==9 ) { - err =set_power_wells (power_domains, skl_power_wells); - }else if (IS_CHERRYVIEW (dev_priv)) { - err =set_power_wells (power_domains, chv_power_wells); - }else if (IS_BROADWELL (dev_priv)) { - err =set_power_wells (power_domains, bdw_power_wells); - }else if (IS_HASWELL (dev_priv)) { - err =set_power_wells (power_domains, hsw_power_wells); - }else if (IS_VALLEYVIEW (dev_priv)) { - err =set_power_wells (power_domains, vlv_power_wells); - }else if (IS_I830 (dev_priv)) { - err =set_power_wells (power_domains, i830_power_wells); - }else { - err = set_power_wells(power_domains,
i9xx_always_on_power_well);drivers/gpu/drm/i915/display/intel_display_power.c +2
-4- } - -return err; +return intel_display_power_map_init (power_domains); }/** @@ -3219,7 +965,7 @@ int intel_power_domains_init(structdrm_i915_private *dev_priv) */ void intel_power_domains_cleanup (struct drm_i915_private *dev_priv) { -kfree (dev_priv->power_domains.power_wells); +intel_display_power_map_cleanup (&dev_priv->power_domains); }static void intel_power_domains_sync_hw(struct
drm_i915_private*dev_priv)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +16
-0@@ -0,0 +1,2150 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2022 Intel Corporation +*/ + +#include "i915_drv.h" +#include "i915_reg.h" + +#include "vlv_sideband_reg.h" + +#include "intel_display_power_map.h" +#include "intel_display_power_well.h" + +#define POWER_DOMAIN_MASK (GENMASK_ULL(POWER_DOMAIN_NUM - 1, 0)) + +static const struct i915_power_well_desc i9xx_always_on_power_well[]= {
drivers/gpu/drm/i915/display/intel_display_power_map.c new file +272
-0+ { + .name = "always-on", + .domains = POWER_DOMAIN_MASK, + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id = DISP_PW_ID_NONE, + }, +}; + +#define I830_PIPES_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PIPE_A) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +static const struct i915_power_well_desc i830_power_wells[] = { + { + .name ="always-on" , + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id =DISP_PW_ID_NONE , + }, { + .name ="pipes" , + .domains =I830_PIPES_POWER_DOMAINS , + .ops = &i830_pipes_power_well_ops, + .id =DISP_PW_ID_NONE , + }, +}; + +#define HSW_DISPLAY_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C) | \ + BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + 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_MMIO) | \ + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +static const struct i915_power_well_desc hsw_power_wells[] = { + { + .name ="always-on" , + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id =DISP_PW_ID_NONE , + }, { + .name ="display" , + .domains =HSW_DISPLAY_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =HSW_DISP_PW_GLOBAL , + { + .hsw.idx =HSW_PW_CTL_IDX_GLOBAL , + .hsw.has_vga = true, + }, + }, +}; + +#define BDW_DISPLAY_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + 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_MMIO) | \ + BIT_ULL(POWER_DOMAIN_AUDIO_PLAYBACK) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +static const struct i915_power_well_desc bdw_power_wells[] = { + { + .name ="always-on" , + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id =DISP_PW_ID_NONE , + }, { + .name ="display" , + .domains =BDW_DISPLAY_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =HSW_DISP_PW_GLOBAL , + { + .hsw.idx =HSW_PW_CTL_IDX_GLOBAL , + .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), + .hsw.has_vga = true, + }, + }, +}; + +#define VLV_DISPLAY_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_DISPLAY_CORE) | \ + BIT_ULL(POWER_DOMAIN_PIPE_A) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DSI) | \ + BIT_ULL(POWER_DOMAIN_PORT_CRT) | \ + BIT_ULL(POWER_DOMAIN_VGA) | \ + 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) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define VLV_DPIO_CMN_BC_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_CRT) | \ + BIT_ULL(POWER_DOMAIN_AUX_B) | \ + BIT_ULL(POWER_DOMAIN_AUX_C) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_B) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_B) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_C) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_C) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +static const struct i915_power_well_desc vlv_power_wells[] = { + { + .name ="always-on" , + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id =DISP_PW_ID_NONE , + }, { + .name ="display" , + .domains =VLV_DISPLAY_POWER_DOMAINS , + .ops = &vlv_display_power_well_ops, + .id =VLV_DISP_PW_DISP2D , + { + .vlv.idx =PUNIT_PWGT_IDX_DISP2D , + }, + }, { + .name ="dpio-tx-b-01" , + .domains =VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS | +VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS | +VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS | +VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS , + .ops = &vlv_dpio_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_B_LANES_01 , + }, + }, { + .name ="dpio-tx-b-23" , + .domains =VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS | +VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS | +VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS | +VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS , + .ops = &vlv_dpio_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_B_LANES_23 , + }, + }, { + .name ="dpio-tx-c-01" , + .domains =VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS | +VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS | +VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS | +VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS , + .ops = &vlv_dpio_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_C_LANES_01 , + }, + }, { + .name ="dpio-tx-c-23" , + .domains =VLV_DPIO_TX_B_LANES_01_POWER_DOMAINS | +VLV_DPIO_TX_B_LANES_23_POWER_DOMAINS | +VLV_DPIO_TX_C_LANES_01_POWER_DOMAINS | +VLV_DPIO_TX_C_LANES_23_POWER_DOMAINS , + .ops = &vlv_dpio_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_C_LANES_23 , + }, + }, { + .name ="dpio-common" , + .domains =VLV_DPIO_CMN_BC_POWER_DOMAINS , + .ops = &vlv_dpio_cmn_power_well_ops, + .id =VLV_DISP_PW_DPIO_CMN_BC , + { + .vlv.idx =PUNIT_PWGT_IDX_DPIO_CMN_BC , + }, + }, +}; + +#define CHV_DISPLAY_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_DISPLAY_CORE) | \ + BIT_ULL(POWER_DOMAIN_PIPE_A) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C) | \ + BIT_ULL(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DSI) | \ + BIT_ULL(POWER_DOMAIN_VGA) | \ + 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) | \ + BIT_ULL(POWER_DOMAIN_GMBUS) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define CHV_DPIO_CMN_BC_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_B) | \ + BIT_ULL(POWER_DOMAIN_AUX_C) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define CHV_DPIO_CMN_D_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_D) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +static const struct i915_power_well_desc chv_power_wells[] = { + { + .name ="always-on" , + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id =DISP_PW_ID_NONE , + }, { + .name ="display" , +/* +* Pipe A power well is the new disp2d well. Pipe B and C
drivers/gpu/drm/i915/display/intel_display_power_map.c new file +1
-0+* power wells don't actually exist. Pipe A power well is
drivers/gpu/drm/i915/display/intel_display_power_map.c new file +263
-0+* required for any pipe to work. +*/ + .domains = CHV_DISPLAY_POWER_DOMAINS, + .ops = &chv_pipe_power_well_ops, + .id = DISP_PW_ID_NONE, + }, { + .name = "dpio-common-bc", + .domains = CHV_DPIO_CMN_BC_POWER_DOMAINS, + .ops = &chv_dpio_cmn_power_well_ops, + .id = VLV_DISP_PW_DPIO_CMN_BC, + { + .vlv.idx = PUNIT_PWGT_IDX_DPIO_CMN_BC, + }, + }, { + .name = "dpio-common-d", + .domains = CHV_DPIO_CMN_D_POWER_DOMAINS, + .ops = &chv_dpio_cmn_power_well_ops, + .id = CHV_DISP_PW_DPIO_CMN_D, + { + .vlv.idx = PUNIT_PWGT_IDX_DPIO_CMN_D, + }, + }, +}; + +#define SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_E_LANES) | \ + BIT_ULL(POWER_DOMAIN_VGA) | \ + 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) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define SKL_DISPLAY_DC_OFF_POWER_DOMAINS ( \ + SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS | \ + BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_MODESET) | \ + BIT_ULL(POWER_DOMAIN_GT_IRQ) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define SKL_DISPLAY_DDI_IO_A_E_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_A_IO) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_E_IO) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define SKL_DISPLAY_DDI_IO_B_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define SKL_DISPLAY_DDI_IO_C_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_IO) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define SKL_DISPLAY_DDI_IO_D_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_D_IO) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +static const struct i915_power_well_desc skl_power_wells[] = { + { + .name ="always-on" , + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id =DISP_PW_ID_NONE , + }, { + .name ="power well 1" , +/* Handled by the DMC firmware */ + .domains =0 , + .ops = &hsw_power_well_ops, + .always_on = true, + .id =SKL_DISP_PW_1 , + { + .hsw.idx =SKL_PW_CTL_IDX_PW_1 , + .hsw.has_fuses = true, + }, + }, { + .name ="MISC IO power well" , +/* Handled by the DMC firmware */ + .domains =0 , + .ops = &hsw_power_well_ops, + .always_on = true, + .id =SKL_DISP_PW_MISC_IO , + { + .hsw.idx =SKL_PW_CTL_IDX_MISC_IO , + }, + }, { + .name ="DC off" , + .domains =SKL_DISPLAY_DC_OFF_POWER_DOMAINS , + .ops = &gen9_dc_off_power_well_ops, + .id =SKL_DISP_DC_OFF , + }, { + .name ="power well 2" , + .domains =SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =SKL_DISP_PW_2 , + { + .hsw.idx =SKL_PW_CTL_IDX_PW_2 , + .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), + .hsw.has_vga = true, + .hsw.has_fuses = true, + }, + }, { + .name ="DDI A/E IO power well" , + .domains =SKL_DISPLAY_DDI_IO_A_E_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =SKL_PW_CTL_IDX_DDI_A_E , + }, + }, { + .name ="DDI B IO power well" , + .domains =SKL_DISPLAY_DDI_IO_B_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =SKL_PW_CTL_IDX_DDI_B , + }, + }, { + .name ="DDI C IO power well" , + .domains =SKL_DISPLAY_DDI_IO_C_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =SKL_PW_CTL_IDX_DDI_C , + }, + }, { + .name ="DDI D IO power well" , + .domains =SKL_DISPLAY_DDI_IO_D_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =SKL_PW_CTL_IDX_DDI_D , + }, + }, +}; + +#define BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_VGA) | \ + 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_INIT)) + +#define BXT_DISPLAY_DC_OFF_POWER_DOMAINS ( \ + BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS | \ + BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_GMBUS) | \ + BIT_ULL(POWER_DOMAIN_MODESET) | \ + BIT_ULL(POWER_DOMAIN_GT_IRQ) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define BXT_DPIO_CMN_A_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_A_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define BXT_DPIO_CMN_BC_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_B) | \ + BIT_ULL(POWER_DOMAIN_AUX_C) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +static const struct i915_power_well_desc bxt_power_wells[] = { + { + .name ="always-on" , + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id =DISP_PW_ID_NONE , + }, { + .name ="power well 1" , +/* Handled by the DMC firmware */ + .domains =0 , + .ops = &hsw_power_well_ops, + .always_on = true, + .id =SKL_DISP_PW_1 , + { + .hsw.idx =SKL_PW_CTL_IDX_PW_1 , + .hsw.has_fuses = true, + }, + }, { + .name ="DC off" , + .domains =BXT_DISPLAY_DC_OFF_POWER_DOMAINS , + .ops = &gen9_dc_off_power_well_ops, + .id =SKL_DISP_DC_OFF , + }, { + .name ="power well 2" , + .domains =BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =SKL_DISP_PW_2 , + { + .hsw.idx =SKL_PW_CTL_IDX_PW_2 , + .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), + .hsw.has_vga = true, + .hsw.has_fuses = true, + }, + }, { + .name ="dpio-common-a" , + .domains =BXT_DPIO_CMN_A_POWER_DOMAINS , + .ops = &bxt_dpio_cmn_power_well_ops, + .id =BXT_DISP_PW_DPIO_CMN_A , + { + .bxt.phy =DPIO_PHY1 , + }, + }, { + .name ="dpio-common-bc" , + .domains =BXT_DPIO_CMN_BC_POWER_DOMAINS , + .ops = &bxt_dpio_cmn_power_well_ops, + .id =VLV_DISP_PW_DPIO_CMN_BC , + { + .bxt.phy =DPIO_PHY0 , + }, + }, +}; + +#define GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_VGA) | \ + 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_INIT)) + +#define GLK_DISPLAY_DC_OFF_POWER_DOMAINS ( \ + GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS | \ + BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_GMBUS) | \ + BIT_ULL(POWER_DOMAIN_MODESET) | \ + BIT_ULL(POWER_DOMAIN_GT_IRQ) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define GLK_DISPLAY_DDI_IO_A_POWER_DOMAINS BIT_ULL(POWER_DOMAIN_PO
RT_DDI_A_IO)
+#defineGLK_DISPLAY_DDI_IO_B_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO)
+#defineGLK_DISPLAY_DDI_IO_C_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_C_IO)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +144
-0+ +#define GLK_DPIO_CMN_A_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_A_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define GLK_DPIO_CMN_B_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_B) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define GLK_DPIO_CMN_C_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_AUX_C) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define GLK_DISPLAY_AUX_A_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_AUX_A) | \ + BIT_ULL(POWER_DOMAIN_AUX_IO_A) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define GLK_DISPLAY_AUX_B_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_AUX_B) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +#define GLK_DISPLAY_AUX_C_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_AUX_C) | \ + BIT_ULL(POWER_DOMAIN_INIT)) + +static const struct i915_power_well_desc glk_power_wells[] = { + { + .name ="always-on" , + .domains =POWER_DOMAIN_MASK , + .ops = &i9xx_always_on_power_well_ops, + .always_on = true, + .id =DISP_PW_ID_NONE , + }, { + .name ="power well 1" , +/* Handled by the DMC firmware */ + .domains =0 , + .ops = &hsw_power_well_ops, + .always_on = true, + .id =SKL_DISP_PW_1 , + { + .hsw.idx =SKL_PW_CTL_IDX_PW_1 , + .hsw.has_fuses = true, + }, + }, { + .name ="DC off" , + .domains =GLK_DISPLAY_DC_OFF_POWER_DOMAINS , + .ops = &gen9_dc_off_power_well_ops, + .id =SKL_DISP_DC_OFF , + }, { + .name ="power well 2" , + .domains =GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =SKL_DISP_PW_2 , + { + .hsw.idx =SKL_PW_CTL_IDX_PW_2 , + .hsw.irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), + .hsw.has_vga = true, + .hsw.has_fuses = true, + }, + }, { + .name ="dpio-common-a" , + .domains =GLK_DPIO_CMN_A_POWER_DOMAINS , + .ops = &bxt_dpio_cmn_power_well_ops, + .id =BXT_DISP_PW_DPIO_CMN_A , + { + .bxt.phy =DPIO_PHY1 , + }, + }, { + .name ="dpio-common-b" , + .domains =GLK_DPIO_CMN_B_POWER_DOMAINS , + .ops = &bxt_dpio_cmn_power_well_ops, + .id =VLV_DISP_PW_DPIO_CMN_BC , + { + .bxt.phy =DPIO_PHY0 , + }, + }, { + .name ="dpio-common-c" , + .domains =GLK_DPIO_CMN_C_POWER_DOMAINS , + .ops = &bxt_dpio_cmn_power_well_ops, + .id =GLK_DISP_PW_DPIO_CMN_C , + { + .bxt.phy =DPIO_PHY2 , + }, + }, { + .name ="AUX A" , + .domains =GLK_DISPLAY_AUX_A_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =GLK_PW_CTL_IDX_AUX_A , + }, + }, { + .name ="AUX B" , + .domains =GLK_DISPLAY_AUX_B_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =GLK_PW_CTL_IDX_AUX_B , + }, + }, { + .name ="AUX C" , + .domains =GLK_DISPLAY_AUX_C_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =GLK_PW_CTL_IDX_AUX_C , + }, + }, { + .name ="DDI A IO power well" , + .domains =GLK_DISPLAY_DDI_IO_A_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =GLK_PW_CTL_IDX_DDI_A , + }, + }, { + .name ="DDI B IO power well" , + .domains =GLK_DISPLAY_DDI_IO_B_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =SKL_PW_CTL_IDX_DDI_B , + }, + }, { + .name ="DDI C IO power well" , + .domains =GLK_DISPLAY_DDI_IO_C_POWER_DOMAINS , + .ops = &hsw_power_well_ops, + .id =DISP_PW_ID_NONE , + { + .hsw.idx =SKL_PW_CTL_IDX_DDI_C , + }, + }, +}; + +/* +* ICL PW_0/PG_0 domains (HW/DMC control): +* - PCI +* - clocks except port PLL +* - central power except FBC +* - shared functions except pipe interrupts, pipe MBUS, DBUF registers
+ * ICL PW_1/PG_1 domains (HW/DMC control):
+ * - DBUF function
+ * -PIPE_Aand its planes, except VGA
+ * - transcoder EDP + PSR
+ * - transcoder DSI
+ * -DDI_A
+ * - FBC
+ */drivers/gpu/drm/i915/display/intel_display_power_map.c new file +52
-0+#define ICL_PW_4_POWER_DOMAINS ( \ + BIT_ULL(POWER_DOMAIN_PIPE_C) | \ + BIT_ULL(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_INIT)) +/* VDSC/joining */ + +#define ICL_PW_3_POWER_DOMAINS ( \ + ICL_PW_4_POWER_DOMAINS | \ + BIT_ULL(POWER_DOMAIN_PIPE_B) | \ + BIT_ULL(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_A) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_B) | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_C) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_B_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_C_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_D_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_E_LANES) | \ + BIT_ULL(POWER_DOMAIN_PORT_DDI_F_LANES) | \ + BIT_ULL(POWER_DOMAIN_VGA) | \ + 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) | \ + BIT_ULL(POWER_DOMAIN_AUX_E) | \ + BIT_ULL(POWER_DOMAIN_AUX_F) | \ + BIT_ULL(POWER_DOMAIN_AUX_C_TBT) | \ + BIT_ULL(POWER_DOMAIN_AUX_D_TBT) | \ + BIT_ULL(POWER_DOMAIN_AUX_E_TBT) | \ + BIT_ULL(POWER_DOMAIN_AUX_F_TBT) | \ + BIT_ULL(POWER_DOMAIN_INIT)) +/* +* - transcoder WD +* - KVMR (HW control) +*/ + +#define ICL_PW_2_POWER_DOMAINS ( \ + ICL_PW_3_POWER_DOMAINS | \ + BIT_ULL(POWER_DOMAIN_TRANSCODER_VDSC_PW2) | \ + BIT_ULL(POWER_DOMAIN_INIT)) +/* +* - KVMR (HW control) +*/ Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
RT_DDI_A_IO)
+#defineICL_DDI_IO_B_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_B_IO)
+#defineICL_DDI_IO_C_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_C_IO)
+#defineICL_DDI_IO_D_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_D_IO)
+#defineICL_DDI_IO_E_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_E_IO)
+#defineICL_DDI_IO_F_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_F_IO)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
X_B)
+#defineICL_AUX_C_TC1_IO_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_C)
+#defineICL_AUX_D_TC2_IO_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_D)
+#defineICL_AUX_E_TC3_IO_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_E)
+#defineICL_AUX_F_TC4_IO_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_F)
+#defineICL_AUX_C_TBT1_IO_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_C_TBT)
+#defineICL_AUX_D_TBT2_IO_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_D_TBT)
+#defineICL_AUX_E_TBT3_IO_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_E_TBT)
+#defineICL_AUX_F_TBT4_IO_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_F_TBT)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +248
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
O_TC1)
+#defineTGL_DDI_IO_TC2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC2)
+#defineTGL_DDI_IO_TC3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC3)
+#defineTGL_DDI_IO_TC4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC4)
+#defineTGL_DDI_IO_TC5_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC5)
+#defineTGL_DDI_IO_TC6_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC6)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
X_USBC1)
+#defineTGL_AUX_IO_USBC2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC2)
+#defineTGL_AUX_IO_USBC3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC3)
+#defineTGL_AUX_IO_USBC4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC4)
+#defineTGL_AUX_IO_USBC5_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC5)
+#defineTGL_AUX_IO_USBC6_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC6)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
X_TBT1)
+#defineTGL_AUX_IO_TBT2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT2)
+#defineTGL_AUX_IO_TBT3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT3)
+#defineTGL_AUX_IO_TBT4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT4)
+#defineTGL_AUX_IO_TBT5_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT5)
+#defineTGL_AUX_IO_TBT6_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT6)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +330
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DDI)
+ */drivers/gpu/drm/i915/display/intel_display_power_map.c new file +284
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
PG(n). That
+ * dependency chain turns into a dependency tree onXE_LPD:
+ *
+ * PG0
+ * |
+ * --PG1--
+ * / \
+ * PGA --PG2--
+ * / | \
+ * PGB PGC PGD
+ *
+ * Power wells must be enabled from top to bottom and disabled from bottom
+ * to top. This allows pipes to be power gated independently.
+ */drivers/gpu/drm/i915/display/intel_display_power_map.c new file +65
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
the DDI)
+ */drivers/gpu/drm/i915/display/intel_display_power_map.c new file +11
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
X_D_XELPD)
+#defineXELPD_AUX_IO_E_XELPD_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_E_XELPD)
+#defineXELPD_AUX_IO_USBC1_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC1)
+#defineXELPD_AUX_IO_USBC2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC2)
+#defineXELPD_AUX_IO_USBC3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC3)
+#defineXELPD_AUX_IO_USBC4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_USBC4)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
OMAIN_AUX_TBT1)
+#defineXELPD_AUX_IO_TBT2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT2)
+#defineXELPD_AUX_IO_TBT3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT3)
+#defineXELPD_AUX_IO_TBT4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_AUX_TBT4)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
RT_DDI_IO_D_XELPD)
+#defineXELPD_DDI_IO_E_XELPD_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_E_XELPD)
+#defineXELPD_DDI_IO_TC1_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC1)
+#defineXELPD_DDI_IO_TC2_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC2)
+#defineXELPD_DDI_IO_TC3_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC3)
+#defineXELPD_DDI_IO_TC4_POWER_DOMAINSBIT_ULL(POWER_DOMAIN_PORT_DDI_IO_TC4)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +269
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
drm_i915_private,drivers/gpu/drm/i915/display/intel_display_power_map.c new file +13
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Quoted 1 line
power_wells),drivers/gpu/drm/i915/display/intel_display_power_map.c new file +17
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
8);
drivers/gpu/drm/i915/display/intel_display_power_map.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
skip_mask) \drivers/gpu/drm/i915/display/intel_display_power_map.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
well mappings
+ * @power_domains: power domain state
+ *
+ * Creates all the power wells for the current platform, initializes the
+ * dynamic state for them and initializes the mapping of each power well to
+ * all the power domains the power well belongs to.
+ */
+intintel_display_power_map_init(struct i915_power_domains *power_domains)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
drm_i915_private,drivers/gpu/drm/i915/display/intel_display_power_map.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
wells,
drivers/gpu/drm/i915/display/intel_display_power_map.c new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
xelpd_power_wells);drivers/gpu/drm/i915/display/intel_display_power_map.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
tgl_power_wells,drivers/gpu/drm/i915/display/intel_display_power_map.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
OFF));
drivers/gpu/drm/i915/display/intel_display_power_map.c new file +22
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
i830_power_wells);drivers/gpu/drm/i915/display/intel_display_power_map.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
i9xx_always_on_power_well);drivers/gpu/drm/i915/display/intel_display_power_map.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
well mappings
+ * @power_domains: power domain state
+ *
+ * Cleans up all the state that was initialized byintel_display_power_map_init().
+ */
+voidintel_display_power_map_cleanup(struct i915_power_domains *power_domains)drivers/gpu/drm/i915/display/intel_display_power_map.c new file +3
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_display_power_map.h new file +11
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*power_domains);
+voidintel_display_power_map_cleanup(struct i915_power_domains *power_domains);drivers/gpu/drm/i915/display/intel_display_power_map.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH v3 4/18 drm/i915: Move the dg2 fixed_enable_delay power well param to a common bitfield
In reply to Imre DeakThe DG2 fixed delay duration is always 600usec, so save some space in the power well descriptors by converting the parameter to a flag. While at it also use a bitfield for both the always_on and fixed_enable_delay flag.
This change also lets simplifying the definiton of power wells sharing the same flags in an upcoming patch.
--- .../gpu/drm/i915/display/intel_display_power_map.c | 10 +++++----- .../drm/i915/display/intel_display_power_well.c | 5 ++--- .../drm/i915/display/intel_display_power_well.h | 14 +++++++------- 3 files changed, 14 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +5 -5
@@ -1920,37 +1920,37 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .name = "AUX A", .domains = ICL_AUX_A_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .fixed_enable_delay = true, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_A, - .hsw.fixed_enable_delay = 600, }, }, { .name = "AUX B", .domains = ICL_AUX_B_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .fixed_enable_delay = true, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_B, - .hsw.fixed_enable_delay = 600, }, }, { .name = "AUX C", .domains = TGL_AUX_C_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .fixed_enable_delay = true, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_C, - .hsw.fixed_enable_delay = 600, }, }, { .name = "AUX D_XELPD", .domains = XELPD_AUX_IO_D_XELPD_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .fixed_enable_delay = true, .id = DISP_PW_ID_NONE, { .hsw.idx = XELPD_PW_CTL_IDX_AUX_D, - .hsw.fixed_enable_delay = 600, }, }, { .name = "AUX E_XELPD",
@@ -1964,10 +1964,10 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .name = "AUX USBC1", .domains = XELPD_AUX_IO_USBC1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .fixed_enable_delay = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1, - .hsw.fixed_enable_delay = 600, }, }, { .name = "AUX USBC2",
drivers/gpu/drm/i915/display/intel_display_power_well.c +2 -3
@@ -242,15 +242,14 @@ static void hsw_wait_for_power_well_enable(struct drm_i915_private *dev_priv, {const struct i915_power_well_regs *regs = power_well->desc->ops->regs;int pw_idx = power_well->desc->hsw.idx; -int enable_delay = power_well->desc->hsw.fixed_enable_delay;/* * For some power wells we're not supposed to watch the status bit for * an ack, but rather just wait a fixed amount of time and then * proceed. This is only used on DG2. */ -if (IS_DG2 (dev_priv) && enable_delay) { -usleep_range (enable_delay,2 * enable_delay); +if (IS_DG2 (dev_priv) && power_well->desc->fixed_enable_delay) { +usleep_range (600 ,1200 );return ; }
drivers/gpu/drm/i915/display/intel_display_power_well.h +7 -7
@@ -50,8 +50,14 @@ enum i915_power_well_id {struct i915_power_well_desc {const char *name; -bool always_on;u64 domains; +u8 always_on:1 ; +/* +* Instead of waiting for the status bit to ack enables, +* just wait a specific amount of time and then consider +* the well enabled. +*/ +u8 fixed_enable_delay:1 ;/* unique identifier for this power well */ enum i915_power_well_id id;/*
@@ -77,12 +83,6 @@ struct i915_power_well_desc {u8 idx;/* Mask of pipes whose IRQ logic is backed by the pw */ u8 irq_pipe_mask; -/* -* Instead of waiting for the status bit to ack enables, -* just wait a specific amount of time and then consider -* the well enabled. -*/ -u16 fixed_enable_delay;/* The pw is backing the VGA functionality */ bool has_vga:1; bool has_fuses:1;
Signature · 1 line
2.30.2
PATCH v3 5/18 drm/i915: Move the HSW power well flags to a common bitfield
In reply to Imre DeakSave some space by grouping the HSW power well descriptor flags along with other flags in one bitfield.
This change also lets simplifying the definition of power well descriptors sharing the same flags in an upcoming patch.
--- .../i915/display/intel_display_power_map.c | 166 +++++++++--------- .../i915/display/intel_display_power_well.c | 16 +- .../i915/display/intel_display_power_well.h | 25 +-- 3 files changed, 104 insertions(+), 103 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +83 -83
@@ -76,10 +76,10 @@ static const struct i915_power_well_desc hsw_power_wells[] = { .name = "display", .domains = HSW_DISPLAY_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_vga = true, .id = HSW_DISP_PW_GLOBAL, { .hsw.idx = HSW_PW_CTL_IDX_GLOBAL, - .hsw.has_vga = true, }, }, };
@@ -112,11 +112,11 @@ static const struct i915_power_well_desc bdw_power_wells[] = { .name = "display", .domains = BDW_DISPLAY_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_vga = true, + .irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), .id = HSW_DISP_PW_GLOBAL, { .hsw.idx = HSW_PW_CTL_IDX_GLOBAL, - .hsw.irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), - .hsw.has_vga = true, }, }, };
@@ -368,10 +368,10 @@ static const struct i915_power_well_desc skl_power_wells[] = { .domains = 0, .ops = &hsw_power_well_ops, .always_on = true, + .has_fuses = true, .id = SKL_DISP_PW_1, { .hsw.idx = SKL_PW_CTL_IDX_PW_1, - .hsw.has_fuses = true, }, }, { .name = "MISC IO power well",
@@ -392,12 +392,12 @@ static const struct i915_power_well_desc skl_power_wells[] = { .name = "power well 2", .domains = SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_vga = true, + .irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), + .has_fuses = true, .id = SKL_DISP_PW_2, { .hsw.idx = SKL_PW_CTL_IDX_PW_2, - .hsw.irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), - .hsw.has_vga = true, - .hsw.has_fuses = true, }, }, { .name = "DDI A/E IO power well",
@@ -484,10 +484,10 @@ static const struct i915_power_well_desc bxt_power_wells[] = { .domains = 0, .ops = &hsw_power_well_ops, .always_on = true, + .has_fuses = true, .id = SKL_DISP_PW_1, { .hsw.idx = SKL_PW_CTL_IDX_PW_1, - .hsw.has_fuses = true, }, }, { .name = "DC off",
@@ -498,12 +498,12 @@ static const struct i915_power_well_desc bxt_power_wells[] = { .name = "power well 2", .domains = BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_vga = true, + .irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), + .has_fuses = true, .id = SKL_DISP_PW_2, { .hsw.idx = SKL_PW_CTL_IDX_PW_2, - .hsw.irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), - .hsw.has_vga = true, - .hsw.has_fuses = true, }, }, { .name = "dpio-common-a",
@@ -594,10 +594,10 @@ static const struct i915_power_well_desc glk_power_wells[] = { .domains = 0, .ops = &hsw_power_well_ops, .always_on = true, + .has_fuses = true, .id = SKL_DISP_PW_1, { .hsw.idx = SKL_PW_CTL_IDX_PW_1, - .hsw.has_fuses = true, }, }, { .name = "DC off",
@@ -608,12 +608,12 @@ static const struct i915_power_well_desc glk_power_wells[] = { .name = "power well 2", .domains = GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_vga = true, + .irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), + .has_fuses = true, .id = SKL_DISP_PW_2, { .hsw.idx = SKL_PW_CTL_IDX_PW_2, - .hsw.irq_pipe_mask = BIT(PIPE_B) | BIT(PIPE_C), - .hsw.has_vga = true, - .hsw.has_fuses = true, }, }, { .name = "dpio-common-a",
@@ -789,10 +789,10 @@ static const struct i915_power_well_desc icl_power_wells[] = { .domains = 0, .ops = &hsw_power_well_ops, .always_on = true, + .has_fuses = true, .id = SKL_DISP_PW_1, { .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .hsw.has_fuses = true, }, }, { .name = "DC off",
@@ -803,21 +803,21 @@ static const struct i915_power_well_desc icl_power_wells[] = { .name = "power well 2", .domains = ICL_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_fuses = true, .id = SKL_DISP_PW_2, { .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, + .has_vga = true, + .irq_pipe_mask = BIT(PIPE_B), + .has_fuses = true, .id = ICL_DISP_PW_3, { .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",
@@ -887,83 +887,83 @@ static const struct i915_power_well_desc icl_power_wells[] = { .name = "AUX C TC1", .domains = ICL_AUX_C_TC1_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_C, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX D TC2", .domains = ICL_AUX_D_TC2_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_D, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX E TC3", .domains = ICL_AUX_E_TC3_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_E, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX F TC4", .domains = ICL_AUX_F_TC4_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_F, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX C TBT1", .domains = ICL_AUX_C_TBT1_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT1, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX D TBT2", .domains = ICL_AUX_D_TBT2_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT2, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX E TBT3", .domains = ICL_AUX_E_TBT3_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT3, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX F TBT4", .domains = ICL_AUX_F_TBT4_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT4, - .hsw.is_tc_tbt = true, }, }, { .name = "power well 4", .domains = ICL_PW_4_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .irq_pipe_mask = BIT(PIPE_C), + .has_fuses = true, .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_PW_4, - .hsw.has_fuses = true, - .hsw.irq_pipe_mask = BIT(PIPE_C), }, }, };
@@ -1077,10 +1077,10 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .domains = 0, .ops = &hsw_power_well_ops, .always_on = true, + .has_fuses = true, .id = SKL_DISP_PW_1, { .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .hsw.has_fuses = true, }, }, { .name = "DC off",
@@ -1091,21 +1091,21 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .name = "power well 2", .domains = TGL_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_fuses = true, .id = SKL_DISP_PW_2, { .hsw.idx = ICL_PW_CTL_IDX_PW_2, - .hsw.has_fuses = true, }, }, { .name = "power well 3", .domains = TGL_PW_3_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_vga = true, + .irq_pipe_mask = BIT(PIPE_B), + .has_fuses = true, .id = ICL_DISP_PW_3, { .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",
@@ -1212,129 +1212,129 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .name = "AUX USBC1", .domains = TGL_AUX_IO_USBC1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .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, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX USBC3", .domains = TGL_AUX_IO_USBC3_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX USBC4", .domains = TGL_AUX_IO_USBC4_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC4, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX USBC5", .domains = TGL_AUX_IO_USBC5_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC5, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX USBC6", .domains = TGL_AUX_IO_USBC6_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC6, - .hsw.is_tc_tbt = false, }, }, { .name = "AUX TBT1", .domains = TGL_AUX_IO_TBT1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX TBT2", .domains = TGL_AUX_IO_TBT2_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX TBT3", .domains = TGL_AUX_IO_TBT3_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX TBT4", .domains = TGL_AUX_IO_TBT4_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX TBT5", .domains = TGL_AUX_IO_TBT5_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT5, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX TBT6", .domains = TGL_AUX_IO_TBT6_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT6, - .hsw.is_tc_tbt = true, }, }, { .name = "power well 4", .domains = TGL_PW_4_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_fuses = true, + .irq_pipe_mask = BIT(PIPE_C), .id = DISP_PW_ID_NONE, { .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, + .has_fuses = true, + .irq_pipe_mask = BIT(PIPE_D), .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_PW_5, - .hsw.has_fuses = true, - .hsw.irq_pipe_mask = BIT(PIPE_D), }, }, };
@@ -1400,10 +1400,10 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .domains = 0, .ops = &hsw_power_well_ops, .always_on = true, + .has_fuses = true, .id = SKL_DISP_PW_1, { .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .hsw.has_fuses = true, }, }, { .name = "DC off",
@@ -1414,22 +1414,22 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .name = "power well 3", .domains = RKL_PW_3_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .irq_pipe_mask = BIT(PIPE_B), + .has_vga = true, + .has_fuses = true, .id = ICL_DISP_PW_3, { .hsw.idx = ICL_PW_CTL_IDX_PW_3, - .hsw.irq_pipe_mask = BIT(PIPE_B), - .hsw.has_vga = true, - .hsw.has_fuses = true, }, }, { .name = "power well 4", .domains = RKL_PW_4_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_fuses = true, + .irq_pipe_mask = BIT(PIPE_C), .id = DISP_PW_ID_NONE, { .hsw.idx = ICL_PW_CTL_IDX_PW_4, - .hsw.has_fuses = true, - .hsw.irq_pipe_mask = BIT(PIPE_C), } }, { .name = "DDI A IO",
@@ -1540,10 +1540,10 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .domains = 0, .ops = &hsw_power_well_ops, .always_on = true, + .has_fuses = true, .id = SKL_DISP_PW_1, { .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .hsw.has_fuses = true, }, }, { .name = "DC off",
@@ -1554,21 +1554,21 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .name = "power well 2", .domains = DG1_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_fuses = true, .id = SKL_DISP_PW_2, { .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, + .irq_pipe_mask = BIT(PIPE_B), + .has_vga = true, + .has_fuses = true, .id = ICL_DISP_PW_3, { .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",
@@ -1622,39 +1622,39 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .name = "AUX USBC1", .domains = TGL_AUX_IO_USBC1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .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, + .is_tc_tbt = false, .id = DISP_PW_ID_NONE, { .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, + .has_fuses = true, + .irq_pipe_mask = BIT(PIPE_C), .id = DISP_PW_ID_NONE, { .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, + .has_fuses = true, + .irq_pipe_mask = BIT(PIPE_D), .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_PW_5, - .hsw.has_fuses = true, - .hsw.irq_pipe_mask = BIT(PIPE_D), }, }, };
@@ -1784,10 +1784,10 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .domains = 0, .ops = &hsw_power_well_ops, .always_on = true, + .has_fuses = true, .id = SKL_DISP_PW_1, { .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .hsw.has_fuses = true, }, }, { .name = "DC off",
@@ -1798,51 +1798,51 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .name = "power well 2", .domains = XELPD_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .has_vga = true, + .has_fuses = true, .id = SKL_DISP_PW_2, { .hsw.idx = ICL_PW_CTL_IDX_PW_2, - .hsw.has_vga = true, - .hsw.has_fuses = true, }, }, { .name = "power well A", .domains = XELPD_PW_A_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .irq_pipe_mask = BIT(PIPE_A), + .has_fuses = true, .id = DISP_PW_ID_NONE, { .hsw.idx = XELPD_PW_CTL_IDX_PW_A, - .hsw.irq_pipe_mask = BIT(PIPE_A), - .hsw.has_fuses = true, }, }, { .name = "power well B", .domains = XELPD_PW_B_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .irq_pipe_mask = BIT(PIPE_B), + .has_fuses = true, .id = DISP_PW_ID_NONE, { .hsw.idx = XELPD_PW_CTL_IDX_PW_B, - .hsw.irq_pipe_mask = BIT(PIPE_B), - .hsw.has_fuses = true, }, }, { .name = "power well C", .domains = XELPD_PW_C_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .irq_pipe_mask = BIT(PIPE_C), + .has_fuses = true, .id = DISP_PW_ID_NONE, { .hsw.idx = XELPD_PW_CTL_IDX_PW_C, - .hsw.irq_pipe_mask = BIT(PIPE_C), - .hsw.has_fuses = true, }, }, { .name = "power well D", .domains = XELPD_PW_D_POWER_DOMAINS, .ops = &hsw_power_well_ops, + .irq_pipe_mask = BIT(PIPE_D), + .has_fuses = true, .id = DISP_PW_ID_NONE, { .hsw.idx = XELPD_PW_CTL_IDX_PW_D, - .hsw.irq_pipe_mask = BIT(PIPE_D), - .hsw.has_fuses = true, }, }, { .name = "DDI A IO",
@@ -1997,37 +1997,37 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .name = "AUX TBT1", .domains = XELPD_AUX_IO_TBT1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX TBT2", .domains = XELPD_AUX_IO_TBT2_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX TBT3", .domains = XELPD_AUX_IO_TBT3_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3, - .hsw.is_tc_tbt = true, }, }, { .name = "AUX TBT4", .domains = XELPD_AUX_IO_TBT4_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, + .is_tc_tbt = true, .id = DISP_PW_ID_NONE, { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4, - .hsw.is_tc_tbt = true, }, }, };
drivers/gpu/drm/i915/display/intel_display_power_well.c +8 -8
@@ -196,8 +196,8 @@ static enum aux_ch icl_aux_pw_to_ch(const struct i915_power_well *power_well) {int pw_idx = power_well->desc->hsw.idx; -return power_well->desc->hsw.is_tc_tbt ?ICL_TBT_AUX_PW_TO_CH (pw_idx) : -ICL_AUX_PW_TO_CH (pw_idx); +return power_well->desc->is_tc_tbt ?ICL_TBT_AUX_PW_TO_CH (pw_idx) : +ICL_AUX_PW_TO_CH (pw_idx); } static struct intel_digital_port *
@@ -325,7 +325,7 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv,int pw_idx = power_well->desc->hsw.idx;u32 val; -if (power_well->desc->hsw.has_fuses) { +if (power_well->desc->has_fuses) {enum skl_power_gate pg; pg = DISPLAY_VER(dev_priv) >= 11 ? ICL_PW_CTL_IDX_TO_PG(pw_idx) :
@@ -352,7 +352,7 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv,hsw_wait_for_power_well_enable (dev_priv, power_well, false); -if (power_well->desc->hsw.has_fuses) { +if (power_well->desc->has_fuses) {enum skl_power_gate pg; pg = DISPLAY_VER(dev_priv) >= 11 ? ICL_PW_CTL_IDX_TO_PG(pw_idx) :
@@ -361,8 +361,8 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv, }hsw_power_well_post_enable (dev_priv, - power_well->desc->hsw.irq_pipe_mask, - power_well->desc->hsw.has_vga); + power_well->desc->irq_pipe_mask, + power_well->desc->has_vga); } static void hsw_power_well_disable(struct drm_i915_private *dev_priv,
@@ -373,7 +373,7 @@ static void hsw_power_well_disable(struct drm_i915_private *dev_priv,u32 val;hsw_power_well_pre_disable (dev_priv, - power_well->desc->hsw.irq_pipe_mask); + power_well->desc->irq_pipe_mask); val =intel_de_read (dev_priv, regs->driver); intel_de_write(dev_priv, regs->driver,
@@ -490,7 +490,7 @@ icl_tc_phy_aux_power_well_enable(struct drm_i915_private *dev_priv,enum aux_ch aux_ch =icl_aux_pw_to_ch (power_well);struct intel_digital_port *dig_port =aux_ch_to_digital_port (dev_priv, aux_ch);const struct i915_power_well_regs *regs = power_well->desc->ops->regs; -bool is_tbt = power_well->desc->hsw.is_tc_tbt; +bool is_tbt = power_well->desc->is_tc_tbt;bool timeout_expected;u32 val;
drivers/gpu/drm/i915/display/intel_display_power_well.h +13 -12
@@ -51,13 +51,24 @@ enum i915_power_well_id {struct i915_power_well_desc {const char *name;u64 domains; -u8 always_on:1 ; +/* Mask of pipes whose IRQ logic is backed by the pw */ +u16 irq_pipe_mask:4 ; +u16 always_on:1 ;/* * Instead of waiting for the status bit to ack enables, * just wait a specific amount of time and then consider * the well enabled. */ -u8 fixed_enable_delay:1 ; +u16 fixed_enable_delay:1 ; +/* The pw is backing the VGA functionality */ +u16 has_vga:1 ; +u16 has_fuses:1 ; +/* +* The pw is for an ICL+ TypeC PHY port in +* Thunderbolt mode. +*/ +u16 is_tc_tbt:1 ; +/* unique identifier for this power well */ enum i915_power_well_id id;/*
@@ -81,16 +92,6 @@ struct i915_power_well_desc {* constrol/status registers. */ u8 idx; -/* Mask of pipes whose IRQ logic is backed by the pw */ -u8 irq_pipe_mask; -/* The pw is backing the VGA functionality */ - bool has_vga:1; - bool has_fuses:1; -/* -* The pw is for an ICL+ TypeC PHY port in -* Thunderbolt mode. -*/ - bool is_tc_tbt:1; } hsw; };const struct i915_power_well_ops *ops;
Signature · 1 line
2.30.2
PATCH v3 6/18 drm/i915: Rename the power domain names to end with pipes/ports
In reply to Imre DeakMake all power domain names end with the pipe/port instance for consistency.
No functional changes.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 8 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 34 ++-- .../drm/i915/display/intel_display_power.c | 116 +++++------ .../drm/i915/display/intel_display_power.h | 66 +++---- .../i915/display/intel_display_power_map.c | 184 +++++++++--------- 6 files changed, 205 insertions(+), 205 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +4 -4
@@ -399,8 +399,8 @@ static void get_dsi_io_power_domains(struct drm_i915_private *dev_priv, intel_dsi->io_wakeref[port] =intel_display_power_get (dev_priv, port ==PORT_A ? -POWER_DOMAIN_PORT_DDI_A_IO : -POWER_DOMAIN_PORT_DDI_B_IO ); +POWER_DOMAIN_PORT_DDI_IO_A : +POWER_DOMAIN_PORT_DDI_IO_B ); } }
@@ -1425,8 +1425,8 @@ static void gen11_dsi_disable_io_power(struct intel_encoder *encoder) wakeref =fetch_and_zero (&intel_dsi->io_wakeref[port]);intel_display_power_put (dev_priv, port ==PORT_A ? -POWER_DOMAIN_PORT_DDI_A_IO : -POWER_DOMAIN_PORT_DDI_B_IO , +POWER_DOMAIN_PORT_DDI_IO_A : +POWER_DOMAIN_PORT_DDI_IO_B , wakeref); }
drivers/gpu/drm/i915/display/intel_ddi.c +1 -1
@@ -4499,7 +4499,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) }drm_WARN_ON (&dev_priv->drm, port >PORT_I ); - dig_port->ddi_io_power_domain =POWER_DOMAIN_PORT_DDI_A_IO + + dig_port->ddi_io_power_domain =POWER_DOMAIN_PORT_DDI_IO_A + port -PORT_A ;if (init_dp) {
drivers/gpu/drm/i915/display/intel_display.c +17 -17
@@ -2190,23 +2190,23 @@ enum intel_display_power_domain intel_port_to_power_domain(enum port port) {switch (port) {case PORT_A : -return POWER_DOMAIN_PORT_DDI_A_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_A ;case PORT_B : -return POWER_DOMAIN_PORT_DDI_B_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_B ;case PORT_C : -return POWER_DOMAIN_PORT_DDI_C_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_C ;case PORT_D : -return POWER_DOMAIN_PORT_DDI_D_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_D ;case PORT_E : -return POWER_DOMAIN_PORT_DDI_E_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_E ;case PORT_F : -return POWER_DOMAIN_PORT_DDI_F_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_F ;case PORT_G : -return POWER_DOMAIN_PORT_DDI_G_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_G ;case PORT_H : -return POWER_DOMAIN_PORT_DDI_H_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_H ;case PORT_I : -return POWER_DOMAIN_PORT_DDI_I_LANES ; +return POWER_DOMAIN_PORT_DDI_LANES_I ;default :MISSING_CASE (port);return POWER_DOMAIN_PORT_OTHER ;
@@ -2219,22 +2219,22 @@ intel_aux_power_domain(struct intel_digital_port *dig_port)if (intel_tc_port_in_tbt_alt_mode (dig_port)) {switch (dig_port->aux_ch) {case AUX_CH_C : -return POWER_DOMAIN_AUX_C_TBT ; +return POWER_DOMAIN_AUX_TBT_C ;case AUX_CH_D : -return POWER_DOMAIN_AUX_D_TBT ; +return POWER_DOMAIN_AUX_TBT_D ;case AUX_CH_E : -return POWER_DOMAIN_AUX_E_TBT ; +return POWER_DOMAIN_AUX_TBT_E ;case AUX_CH_F : -return POWER_DOMAIN_AUX_F_TBT ; +return POWER_DOMAIN_AUX_TBT_F ;case AUX_CH_G : -return POWER_DOMAIN_AUX_G_TBT ; +return POWER_DOMAIN_AUX_TBT_G ;case AUX_CH_H : -return POWER_DOMAIN_AUX_H_TBT ; +return POWER_DOMAIN_AUX_TBT_H ;case AUX_CH_I : -return POWER_DOMAIN_AUX_I_TBT ; +return POWER_DOMAIN_AUX_TBT_I ;default :MISSING_CASE (dig_port->aux_ch); -return POWER_DOMAIN_AUX_C_TBT ; +return POWER_DOMAIN_AUX_TBT_C ; } }
drivers/gpu/drm/i915/display/intel_display_power.c +58 -58
134 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power.h +33 -33
99 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_map.c +92 -92
424 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH v3 7/18 drm/i915: Sanitize the power well names
In reply to Imre DeakUse the shortest descriptive name for all power wells for simplicity and to use the same name for the same type of power wells on multiple platforms.
--- .../i915/display/intel_display_power_map.c | 254 +++++++++--------- 1 file changed, 127 insertions(+), 127 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +127 -127
@@ -363,7 +363,7 @@ static const struct i915_power_well_desc skl_power_wells[] = { .always_on = true, .id = DISP_PW_ID_NONE, }, { - .name = "power well 1", + .name = "PW_1", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -374,7 +374,7 @@ static const struct i915_power_well_desc skl_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_PW_1, }, }, { - .name = "MISC IO power well", + .name = "MISC_IO", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -384,12 +384,12 @@ static const struct i915_power_well_desc skl_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_MISC_IO, }, }, { - .name = "DC off", + .name = "DC_off", .domains = SKL_DISPLAY_DC_OFF_POWER_DOMAINS, .ops = &gen9_dc_off_power_well_ops, .id = SKL_DISP_DC_OFF, }, { - .name = "power well 2", + .name = "PW_2", .domains = SKL_DISPLAY_POWERWELL_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_vga = true,
@@ -400,7 +400,7 @@ static const struct i915_power_well_desc skl_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_PW_2, }, }, { - .name = "DDI A/E IO power well", + .name = "DDI_IO_A_E", .domains = SKL_DISPLAY_DDI_IO_A_E_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -408,7 +408,7 @@ static const struct i915_power_well_desc skl_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_DDI_A_E, }, }, { - .name = "DDI B IO power well", + .name = "DDI_IO_B", .domains = SKL_DISPLAY_DDI_IO_B_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -416,7 +416,7 @@ static const struct i915_power_well_desc skl_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_DDI_B, }, }, { - .name = "DDI C IO power well", + .name = "DDI_IO_C", .domains = SKL_DISPLAY_DDI_IO_C_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -424,7 +424,7 @@ static const struct i915_power_well_desc skl_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_DDI_C, }, }, { - .name = "DDI D IO power well", + .name = "DDI_IO_D", .domains = SKL_DISPLAY_DDI_IO_D_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -479,7 +479,7 @@ static const struct i915_power_well_desc bxt_power_wells[] = { .always_on = true, .id = DISP_PW_ID_NONE, }, { - .name = "power well 1", + .name = "PW_1", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -490,12 +490,12 @@ static const struct i915_power_well_desc bxt_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_PW_1, }, }, { - .name = "DC off", + .name = "DC_off", .domains = BXT_DISPLAY_DC_OFF_POWER_DOMAINS, .ops = &gen9_dc_off_power_well_ops, .id = SKL_DISP_DC_OFF, }, { - .name = "power well 2", + .name = "PW_2", .domains = BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_vga = true,
@@ -589,7 +589,7 @@ static const struct i915_power_well_desc glk_power_wells[] = { .always_on = true, .id = DISP_PW_ID_NONE, }, { - .name = "power well 1", + .name = "PW_1", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -600,12 +600,12 @@ static const struct i915_power_well_desc glk_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_PW_1, }, }, { - .name = "DC off", + .name = "DC_off", .domains = GLK_DISPLAY_DC_OFF_POWER_DOMAINS, .ops = &gen9_dc_off_power_well_ops, .id = SKL_DISP_DC_OFF, }, { - .name = "power well 2", + .name = "PW_2", .domains = GLK_DISPLAY_POWERWELL_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_vga = true,
@@ -640,7 +640,7 @@ static const struct i915_power_well_desc glk_power_wells[] = { .bxt.phy = DPIO_PHY2, }, }, { - .name = "AUX A", + .name = "AUX_A", .domains = GLK_DISPLAY_AUX_A_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -648,7 +648,7 @@ static const struct i915_power_well_desc glk_power_wells[] = { .hsw.idx = GLK_PW_CTL_IDX_AUX_A, }, }, { - .name = "AUX B", + .name = "AUX_B", .domains = GLK_DISPLAY_AUX_B_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -656,7 +656,7 @@ static const struct i915_power_well_desc glk_power_wells[] = { .hsw.idx = GLK_PW_CTL_IDX_AUX_B, }, }, { - .name = "AUX C", + .name = "AUX_C", .domains = GLK_DISPLAY_AUX_C_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -664,7 +664,7 @@ static const struct i915_power_well_desc glk_power_wells[] = { .hsw.idx = GLK_PW_CTL_IDX_AUX_C, }, }, { - .name = "DDI A IO power well", + .name = "DDI_IO_A", .domains = GLK_DISPLAY_DDI_IO_A_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -672,7 +672,7 @@ static const struct i915_power_well_desc glk_power_wells[] = { .hsw.idx = GLK_PW_CTL_IDX_DDI_A, }, }, { - .name = "DDI B IO power well", + .name = "DDI_IO_B", .domains = GLK_DISPLAY_DDI_IO_B_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -680,7 +680,7 @@ static const struct i915_power_well_desc glk_power_wells[] = { .hsw.idx = SKL_PW_CTL_IDX_DDI_B, }, }, { - .name = "DDI C IO power well", + .name = "DDI_IO_C", .domains = GLK_DISPLAY_DDI_IO_C_POWER_DOMAINS, .ops = &hsw_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -784,7 +784,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .always_on = true, .id = DISP_PW_ID_NONE, }, { - .name = "power well 1", + .name = "PW_1", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -795,12 +795,12 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_1, }, }, { - .name = "DC off", + .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", + .name = "PW_2", .domains = ICL_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_fuses = true,
@@ -809,7 +809,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_2, }, }, { - .name = "power well 3", + .name = "PW_3", .domains = ICL_PW_3_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_vga = true,
@@ -820,7 +820,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_3, }, }, { - .name = "DDI A IO", + .name = "DDI_IO_A", .domains = ICL_DDI_IO_A_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -828,7 +828,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_A, }, }, { - .name = "DDI B IO", + .name = "DDI_IO_B", .domains = ICL_DDI_IO_B_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -836,7 +836,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_B, }, }, { - .name = "DDI C IO", + .name = "DDI_IO_C", .domains = ICL_DDI_IO_C_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -844,7 +844,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_C, }, }, { - .name = "DDI D IO", + .name = "DDI_IO_D", .domains = ICL_DDI_IO_D_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -852,7 +852,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_D, }, }, { - .name = "DDI E IO", + .name = "DDI_IO_E", .domains = ICL_DDI_IO_E_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -860,7 +860,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_E, }, }, { - .name = "DDI F IO", + .name = "DDI_IO_F", .domains = ICL_DDI_IO_F_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -868,7 +868,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_F, }, }, { - .name = "AUX A", + .name = "AUX_A", .domains = ICL_AUX_A_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -876,7 +876,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_A, }, }, { - .name = "AUX B", + .name = "AUX_B", .domains = ICL_AUX_B_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -884,7 +884,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_B, }, }, { - .name = "AUX C TC1", + .name = "AUX_C", .domains = ICL_AUX_C_TC1_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -893,7 +893,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_C, }, }, { - .name = "AUX D TC2", + .name = "AUX_D", .domains = ICL_AUX_D_TC2_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -902,7 +902,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_D, }, }, { - .name = "AUX E TC3", + .name = "AUX_E", .domains = ICL_AUX_E_TC3_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -911,7 +911,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_E, }, }, { - .name = "AUX F TC4", + .name = "AUX_F", .domains = ICL_AUX_F_TC4_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -920,7 +920,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_F, }, }, { - .name = "AUX C TBT1", + .name = "AUX_TBT1", .domains = ICL_AUX_C_TBT1_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -929,7 +929,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT1, }, }, { - .name = "AUX D TBT2", + .name = "AUX_TBT2", .domains = ICL_AUX_D_TBT2_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -938,7 +938,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT2, }, }, { - .name = "AUX E TBT3", + .name = "AUX_TBT3", .domains = ICL_AUX_E_TBT3_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -947,7 +947,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT3, }, }, { - .name = "AUX F TBT4", + .name = "AUX_TBT4", .domains = ICL_AUX_F_TBT4_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -956,7 +956,7 @@ static const struct i915_power_well_desc icl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT4, }, }, { - .name = "power well 4", + .name = "PW_4", .domains = ICL_PW_4_POWER_DOMAINS, .ops = &hsw_power_well_ops, .irq_pipe_mask = BIT(PIPE_C),
@@ -1072,7 +1072,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .always_on = true, .id = DISP_PW_ID_NONE, }, { - .name = "power well 1", + .name = "PW_1", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -1083,12 +1083,12 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_1, }, }, { - .name = "DC off", + .name = "DC_off", .domains = TGL_DISPLAY_DC_OFF_POWER_DOMAINS, .ops = &gen9_dc_off_power_well_ops, .id = SKL_DISP_DC_OFF, }, { - .name = "power well 2", + .name = "PW_2", .domains = TGL_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_fuses = true,
@@ -1097,7 +1097,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_2, }, }, { - .name = "power well 3", + .name = "PW_3", .domains = TGL_PW_3_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_vga = true,
@@ -1108,7 +1108,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_3, }, }, { - .name = "DDI A IO", + .name = "DDI_IO_A", .domains = ICL_DDI_IO_A_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1116,7 +1116,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_A, } }, { - .name = "DDI B IO", + .name = "DDI_IO_B", .domains = ICL_DDI_IO_B_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1124,7 +1124,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_B, } }, { - .name = "DDI C IO", + .name = "DDI_IO_C", .domains = ICL_DDI_IO_C_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1132,7 +1132,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_C, } }, { - .name = "DDI IO TC1", + .name = "DDI_IO_TC1", .domains = TGL_DDI_IO_TC1_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1140,7 +1140,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1, }, }, { - .name = "DDI IO TC2", + .name = "DDI_IO_TC2", .domains = TGL_DDI_IO_TC2_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1148,7 +1148,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2, }, }, { - .name = "DDI IO TC3", + .name = "DDI_IO_TC3", .domains = TGL_DDI_IO_TC3_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1156,7 +1156,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC3, }, }, { - .name = "DDI IO TC4", + .name = "DDI_IO_TC4", .domains = TGL_DDI_IO_TC4_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1164,7 +1164,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC4, }, }, { - .name = "DDI IO TC5", + .name = "DDI_IO_TC5", .domains = TGL_DDI_IO_TC5_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1172,7 +1172,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC5, }, }, { - .name = "DDI IO TC6", + .name = "DDI_IO_TC6", .domains = TGL_DDI_IO_TC6_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1180,12 +1180,12 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC6, }, }, { - .name = "TC cold off", + .name = "TC_cold_off", .domains = TGL_TC_COLD_OFF_POWER_DOMAINS, .ops = &tgl_tc_cold_off_ops, .id = TGL_DISP_PW_TC_COLD_OFF, }, { - .name = "AUX A", + .name = "AUX_A", .domains = TGL_AUX_A_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1193,7 +1193,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_A, }, }, { - .name = "AUX B", + .name = "AUX_B", .domains = TGL_AUX_B_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1201,7 +1201,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_B, }, }, { - .name = "AUX C", + .name = "AUX_C", .domains = TGL_AUX_C_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1209,7 +1209,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_C, }, }, { - .name = "AUX USBC1", + .name = "AUX_USBC1", .domains = TGL_AUX_IO_USBC1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -1218,7 +1218,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1, }, }, { - .name = "AUX USBC2", + .name = "AUX_USBC2", .domains = TGL_AUX_IO_USBC2_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -1227,7 +1227,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2, }, }, { - .name = "AUX USBC3", + .name = "AUX_USBC3", .domains = TGL_AUX_IO_USBC3_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -1236,7 +1236,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3, }, }, { - .name = "AUX USBC4", + .name = "AUX_USBC4", .domains = TGL_AUX_IO_USBC4_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -1245,7 +1245,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC4, }, }, { - .name = "AUX USBC5", + .name = "AUX_USBC5", .domains = TGL_AUX_IO_USBC5_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -1254,7 +1254,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC5, }, }, { - .name = "AUX USBC6", + .name = "AUX_USBC6", .domains = TGL_AUX_IO_USBC6_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -1263,7 +1263,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC6, }, }, { - .name = "AUX TBT1", + .name = "AUX_TBT1", .domains = TGL_AUX_IO_TBT1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -1272,7 +1272,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1, }, }, { - .name = "AUX TBT2", + .name = "AUX_TBT2", .domains = TGL_AUX_IO_TBT2_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -1281,7 +1281,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2, }, }, { - .name = "AUX TBT3", + .name = "AUX_TBT3", .domains = TGL_AUX_IO_TBT3_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -1290,7 +1290,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3, }, }, { - .name = "AUX TBT4", + .name = "AUX_TBT4", .domains = TGL_AUX_IO_TBT4_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -1299,7 +1299,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4, }, }, { - .name = "AUX TBT5", + .name = "AUX_TBT5", .domains = TGL_AUX_IO_TBT5_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -1308,7 +1308,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT5, }, }, { - .name = "AUX TBT6", + .name = "AUX_TBT6", .domains = TGL_AUX_IO_TBT6_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -1317,7 +1317,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT6, }, }, { - .name = "power well 4", + .name = "PW_4", .domains = TGL_PW_4_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_fuses = true,
@@ -1327,7 +1327,7 @@ static const struct i915_power_well_desc tgl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_4, } }, { - .name = "power well 5", + .name = "PW_5", .domains = TGL_PW_5_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_fuses = true,
@@ -1395,7 +1395,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .always_on = true, .id = DISP_PW_ID_NONE, }, { - .name = "power well 1", + .name = "PW_1", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -1406,12 +1406,12 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_1, }, }, { - .name = "DC off", + .name = "DC_off", .domains = RKL_DISPLAY_DC_OFF_POWER_DOMAINS, .ops = &gen9_dc_off_power_well_ops, .id = SKL_DISP_DC_OFF, }, { - .name = "power well 3", + .name = "PW_3", .domains = RKL_PW_3_POWER_DOMAINS, .ops = &hsw_power_well_ops, .irq_pipe_mask = BIT(PIPE_B),
@@ -1422,7 +1422,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_3, }, }, { - .name = "power well 4", + .name = "PW_4", .domains = RKL_PW_4_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_fuses = true,
@@ -1432,7 +1432,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_4, } }, { - .name = "DDI A IO", + .name = "DDI_IO_A", .domains = ICL_DDI_IO_A_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1440,7 +1440,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_A, } }, { - .name = "DDI B IO", + .name = "DDI_IO_B", .domains = ICL_DDI_IO_B_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1448,7 +1448,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_B, } }, { - .name = "DDI IO TC1", + .name = "DDI_IO_TC1", .domains = TGL_DDI_IO_TC1_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1456,7 +1456,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1, }, }, { - .name = "DDI IO TC2", + .name = "DDI_IO_TC2", .domains = TGL_DDI_IO_TC2_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1464,7 +1464,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2, }, }, { - .name = "AUX A", + .name = "AUX_A", .domains = ICL_AUX_A_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1472,7 +1472,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_A, }, }, { - .name = "AUX B", + .name = "AUX_B", .domains = ICL_AUX_B_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1480,7 +1480,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_B, }, }, { - .name = "AUX USBC1", + .name = "AUX_USBC1", .domains = TGL_AUX_IO_USBC1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1488,7 +1488,7 @@ static const struct i915_power_well_desc rkl_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1, }, }, { - .name = "AUX USBC2", + .name = "AUX_USBC2", .domains = TGL_AUX_IO_USBC2_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1535,7 +1535,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .always_on = true, .id = DISP_PW_ID_NONE, }, { - .name = "power well 1", + .name = "PW_1", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -1546,12 +1546,12 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_1, }, }, { - .name = "DC off", + .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", + .name = "PW_2", .domains = DG1_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_fuses = true,
@@ -1560,7 +1560,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_2, }, }, { - .name = "power well 3", + .name = "PW_3", .domains = DG1_PW_3_POWER_DOMAINS, .ops = &hsw_power_well_ops, .irq_pipe_mask = BIT(PIPE_B),
@@ -1571,7 +1571,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_3, }, }, { - .name = "DDI A IO", + .name = "DDI_IO_A", .domains = ICL_DDI_IO_A_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1579,7 +1579,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_A, } }, { - .name = "DDI B IO", + .name = "DDI_IO_B", .domains = ICL_DDI_IO_B_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1587,7 +1587,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_B, } }, { - .name = "DDI IO TC1", + .name = "DDI_IO_TC1", .domains = TGL_DDI_IO_TC1_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1595,7 +1595,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1, }, }, { - .name = "DDI IO TC2", + .name = "DDI_IO_TC2", .domains = TGL_DDI_IO_TC2_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1603,7 +1603,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2, }, }, { - .name = "AUX A", + .name = "AUX_A", .domains = TGL_AUX_A_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1611,7 +1611,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_A, }, }, { - .name = "AUX B", + .name = "AUX_B", .domains = TGL_AUX_B_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1619,7 +1619,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_B, }, }, { - .name = "AUX USBC1", + .name = "AUX_USBC1", .domains = TGL_AUX_IO_USBC1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -1628,7 +1628,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1, }, }, { - .name = "AUX USBC2", + .name = "AUX_USBC2", .domains = TGL_AUX_IO_USBC2_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = false,
@@ -1637,7 +1637,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2, }, }, { - .name = "power well 4", + .name = "PW_4", .domains = TGL_PW_4_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_fuses = true,
@@ -1647,7 +1647,7 @@ static const struct i915_power_well_desc dg1_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_4, } }, { - .name = "power well 5", + .name = "PW_5", .domains = TGL_PW_5_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_fuses = true,
@@ -1779,7 +1779,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .always_on = true, .id = DISP_PW_ID_NONE, }, { - .name = "power well 1", + .name = "PW_1", /* Handled by the DMC firmware */ .domains = 0, .ops = &hsw_power_well_ops,
@@ -1790,12 +1790,12 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_1, }, }, { - .name = "DC off", + .name = "DC_off", .domains = XELPD_DISPLAY_DC_OFF_POWER_DOMAINS, .ops = &gen9_dc_off_power_well_ops, .id = SKL_DISP_DC_OFF, }, { - .name = "power well 2", + .name = "PW_2", .domains = XELPD_PW_2_POWER_DOMAINS, .ops = &hsw_power_well_ops, .has_vga = true,
@@ -1805,7 +1805,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_PW_2, }, }, { - .name = "power well A", + .name = "PW_A", .domains = XELPD_PW_A_POWER_DOMAINS, .ops = &hsw_power_well_ops, .irq_pipe_mask = BIT(PIPE_A),
@@ -1815,7 +1815,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = XELPD_PW_CTL_IDX_PW_A, }, }, { - .name = "power well B", + .name = "PW_B", .domains = XELPD_PW_B_POWER_DOMAINS, .ops = &hsw_power_well_ops, .irq_pipe_mask = BIT(PIPE_B),
@@ -1825,7 +1825,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = XELPD_PW_CTL_IDX_PW_B, }, }, { - .name = "power well C", + .name = "PW_C", .domains = XELPD_PW_C_POWER_DOMAINS, .ops = &hsw_power_well_ops, .irq_pipe_mask = BIT(PIPE_C),
@@ -1835,7 +1835,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = XELPD_PW_CTL_IDX_PW_C, }, }, { - .name = "power well D", + .name = "PW_D", .domains = XELPD_PW_D_POWER_DOMAINS, .ops = &hsw_power_well_ops, .irq_pipe_mask = BIT(PIPE_D),
@@ -1845,7 +1845,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = XELPD_PW_CTL_IDX_PW_D, }, }, { - .name = "DDI A IO", + .name = "DDI_IO_A", .domains = ICL_DDI_IO_A_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1853,7 +1853,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_A, } }, { - .name = "DDI B IO", + .name = "DDI_IO_B", .domains = ICL_DDI_IO_B_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1861,7 +1861,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_B, } }, { - .name = "DDI C IO", + .name = "DDI_IO_C", .domains = ICL_DDI_IO_C_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1869,7 +1869,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_DDI_C, } }, { - .name = "DDI IO D_XELPD", + .name = "DDI_IO_D_XELPD", .domains = XELPD_DDI_IO_D_XELPD_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1877,7 +1877,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = XELPD_PW_CTL_IDX_DDI_D, } }, { - .name = "DDI IO E_XELPD", + .name = "DDI_IO_E_XELPD", .domains = XELPD_DDI_IO_E_XELPD_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1885,7 +1885,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = XELPD_PW_CTL_IDX_DDI_E, } }, { - .name = "DDI IO TC1", + .name = "DDI_IO_TC1", .domains = XELPD_DDI_IO_TC1_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1893,7 +1893,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1, } }, { - .name = "DDI IO TC2", + .name = "DDI_IO_TC2", .domains = XELPD_DDI_IO_TC2_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1901,7 +1901,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2, } }, { - .name = "DDI IO TC3", + .name = "DDI_IO_TC3", .domains = XELPD_DDI_IO_TC3_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1909,7 +1909,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC3, } }, { - .name = "DDI IO TC4", + .name = "DDI_IO_TC4", .domains = XELPD_DDI_IO_TC4_POWER_DOMAINS, .ops = &icl_ddi_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1917,7 +1917,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_DDI_TC4, } }, { - .name = "AUX A", + .name = "AUX_A", .domains = ICL_AUX_A_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .fixed_enable_delay = true,
@@ -1926,7 +1926,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_A, }, }, { - .name = "AUX B", + .name = "AUX_B", .domains = ICL_AUX_B_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .fixed_enable_delay = true,
@@ -1935,7 +1935,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_B, }, }, { - .name = "AUX C", + .name = "AUX_C", .domains = TGL_AUX_C_IO_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .fixed_enable_delay = true,
@@ -1944,7 +1944,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = ICL_PW_CTL_IDX_AUX_C, }, }, { - .name = "AUX D_XELPD", + .name = "AUX_D_XELPD", .domains = XELPD_AUX_IO_D_XELPD_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .fixed_enable_delay = true,
@@ -1953,7 +1953,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = XELPD_PW_CTL_IDX_AUX_D, }, }, { - .name = "AUX E_XELPD", + .name = "AUX_E_XELPD", .domains = XELPD_AUX_IO_E_XELPD_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1961,7 +1961,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = XELPD_PW_CTL_IDX_AUX_E, }, }, { - .name = "AUX USBC1", + .name = "AUX_USBC1", .domains = XELPD_AUX_IO_USBC1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .fixed_enable_delay = true,
@@ -1970,7 +1970,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1, }, }, { - .name = "AUX USBC2", + .name = "AUX_USBC2", .domains = XELPD_AUX_IO_USBC2_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1978,7 +1978,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2, }, }, { - .name = "AUX USBC3", + .name = "AUX_USBC3", .domains = XELPD_AUX_IO_USBC3_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1986,7 +1986,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3, }, }, { - .name = "AUX USBC4", + .name = "AUX_USBC4", .domains = XELPD_AUX_IO_USBC4_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .id = DISP_PW_ID_NONE,
@@ -1994,7 +1994,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TC4, }, }, { - .name = "AUX TBT1", + .name = "AUX_TBT1", .domains = XELPD_AUX_IO_TBT1_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -2003,7 +2003,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1, }, }, { - .name = "AUX TBT2", + .name = "AUX_TBT2", .domains = XELPD_AUX_IO_TBT2_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -2012,7 +2012,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2, }, }, { - .name = "AUX TBT3", + .name = "AUX_TBT3", .domains = XELPD_AUX_IO_TBT3_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
@@ -2021,7 +2021,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3, }, }, { - .name = "AUX TBT4", + .name = "AUX_TBT4", .domains = XELPD_AUX_IO_TBT4_POWER_DOMAINS, .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
Signature · 1 line
2.30.2
PATCH v3 8/18 drm/i915: Convert the power well descriptor domain mask to an array of domains
In reply to Imre DeakThe next patch converts the i915_power_well_desc::domain mask from a u64 mask to a bitmap. I didn't find a reasonably simple way to initialize bitmaps statically, so prepare for the next patch here by converting the masks to an array of domain enums and initing the masks from these arrays during module loading.
v2: Clarify list vs. array in the commit message. (Jani)
--- .../drm/i915/display/intel_display_power.c | 4 +- .../i915/display/intel_display_power_map.c | 1427 +++++++++-------- .../i915/display/intel_display_power_well.c | 2 +- .../i915/display/intel_display_power_well.h | 6 +- 4 files changed, 754 insertions(+), 685 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +2 -2
@@ -24,11 +24,11 @@#define for_each_power_domain_well (__dev_priv, __power_well, __domain_mask) \ for_each_power_well(__dev_priv, __power_well) \ - for_each_if((__power_well)->desc->domains & (__domain_mask)) + for_each_if((__power_well)->domains & (__domain_mask))#define for_each_power_domain_well_reverse (__dev_priv, __power_well, __domain_mask) \ for_each_power_well_reverse(__dev_priv, __power_well) \ - for_each_if((__power_well)->desc->domains & (__domain_mask)) + for_each_if((__power_well)->domains & (__domain_mask))const char *intel_display_power_domain_str (enum intel_display_power_domain domain)
drivers/gpu/drm/i915/display/intel_display_power_map.c +746 -681
2,472 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_well.c +1 -1
@@ -155,7 +155,7 @@ const char *intel_power_well_name(struct i915_power_well *power_well)u64 intel_power_well_domains (struct i915_power_well *power_well) { -return power_well->desc->domains; +return power_well->domains; }int intel_power_well_refcount (struct i915_power_well *power_well)
drivers/gpu/drm/i915/display/intel_display_power_well.h +5 -1
@@ -50,7 +50,10 @@ enum i915_power_well_id {struct i915_power_well_desc {const char *name; -u64 domains; +const struct i915_power_domain_list { +const enum intel_display_power_domain *list; +u8 count; + } *domain_list;/* Mask of pipes whose IRQ logic is backed by the pw */ u16 irq_pipe_mask:4 ;u16 always_on:1 ;
@@ -99,6 +102,7 @@ struct i915_power_well_desc {struct i915_power_well {const struct i915_power_well_desc *desc; +u64 domains;/* power well enable/disable usage count */ int count;/* cached hw enabled state */
Signature · 1 line
2.30.2
PATCH v3 9/18 drm/i915: Convert the u64 power well domains mask to a bitmap
In reply to Imre DeakTo remove the aliasing of the power domain enum values in a follow-up patch in this patchset (requiring a bigger mask) and allow for defining additional power domains in the future (at least some upcoming TypeC changes requires this) convert the u64 i915_power_well_desc::domains mask to a bitmap.
For simplicity I changed the for_each_power_domain_well() macros to accept one domain only instead of a mask, as there isn't any current user passing multiple domains.
v2: Don't add a typedef for the bitmap struct. (Jani)
--- drivers/gpu/drm/i915/display/intel_display.c | 65 ++++++----- .../drm/i915/display/intel_display_power.c | 108 +++++++++++------- .../drm/i915/display/intel_display_power.h | 18 +-- .../i915/display/intel_display_power_map.c | 4 +- .../i915/display/intel_display_power_well.c | 4 +- .../i915/display/intel_display_power_well.h | 5 +- 6 files changed, 116 insertions(+), 88 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +34 -31
@@ -2273,66 +2273,71 @@ intel_legacy_aux_to_power_domain(enum aux_ch aux_ch) } } -static u64 get_crtc_power_domains (struct intel_crtc_state *crtc_state) +static void get_crtc_power_domains (struct intel_crtc_state *crtc_state, +struct intel_power_domain_mask *mask) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;struct drm_encoder *encoder;enum pipe pipe = crtc->pipe; -u64 mask; + +bitmap_zero (mask->bits,POWER_DOMAIN_NUM );if (!crtc_state->hw.active) -return 0 ; +return ; - mask =BIT_ULL (POWER_DOMAIN_PIPE (pipe)); - mask |=BIT_ULL (POWER_DOMAIN_TRANSCODER (cpu_transcoder)); +set_bit (POWER_DOMAIN_PIPE (pipe), mask->bits); +set_bit (POWER_DOMAIN_TRANSCODER (cpu_transcoder), mask->bits);if (crtc_state->pch_pfit.enabled || crtc_state->pch_pfit.force_thru) - mask |=BIT_ULL (POWER_DOMAIN_PIPE_PANEL_FITTER (pipe)); +set_bit (POWER_DOMAIN_PIPE_PANEL_FITTER (pipe), mask->bits);drm_for_each_encoder_mask (encoder, &dev_priv->drm, crtc_state->uapi.encoder_mask) {struct intel_encoder *intel_encoder =to_intel_encoder (encoder); - mask |=BIT_ULL (intel_encoder->power_domain); +set_bit (intel_encoder->power_domain, mask->bits); }if (HAS_DDI (dev_priv) && crtc_state->has_audio) - mask |=BIT_ULL (POWER_DOMAIN_AUDIO_MMIO ); +set_bit (POWER_DOMAIN_AUDIO_MMIO , mask->bits);if (crtc_state->shared_dpll) - mask |=BIT_ULL (POWER_DOMAIN_DISPLAY_CORE ); +set_bit (POWER_DOMAIN_DISPLAY_CORE , mask->bits);if (crtc_state->dsc.compression_enable) - mask |=BIT_ULL (intel_dsc_power_domain (crtc, cpu_transcoder)); - -return mask; +set_bit (intel_dsc_power_domain (crtc, cpu_transcoder), mask->bits); } -static u64 -modeset_get_crtc_power_domains (struct intel_crtc_state *crtc_state) +static void +modeset_get_crtc_power_domains (struct intel_crtc_state *crtc_state, +struct intel_power_domain_mask *old_domains) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum intel_display_power_domain domain; -u64 domains, new_domains, old_domains; +struct intel_power_domain_mask domains, new_domains; - domains =get_crtc_power_domains (crtc_state); +get_crtc_power_domains (crtc_state, &domains); - new_domains = domains & ~crtc->enabled_power_domains.mask; - old_domains = crtc->enabled_power_domains.mask & ~domains; +bitmap_andnot (new_domains.bits, + domains.bits, + crtc->enabled_power_domains.mask.bits, +POWER_DOMAIN_NUM ); +bitmap_andnot (old_domains->bits, + crtc->enabled_power_domains.mask.bits, + domains.bits, +POWER_DOMAIN_NUM ); -for_each_power_domain (domain, new_domains) +for_each_power_domain (domain, &new_domains)intel_display_power_get_in_set (dev_priv, &crtc->enabled_power_domains, domain); - -return old_domains; }static void modeset_put_crtc_power_domains (struct intel_crtc *crtc, -u64 domains) +struct intel_power_domain_mask *domains) { intel_display_power_put_mask_in_set(to_i915(crtc->base.dev), &crtc->enabled_power_domains,
@@ -8545,7 +8550,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc_state *new_crtc_state, *old_crtc_state;struct intel_crtc *crtc; -u64 put_domains[I915_MAX_PIPES ] = {}; +struct intel_power_domain_mask put_domains[I915_MAX_PIPES ] = {};intel_wakeref_t wakeref =0 ;int i;
@@ -8562,9 +8567,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) new_crtc_state, i) {if (intel_crtc_needs_modeset (new_crtc_state) || new_crtc_state->update_pipe) { - - put_domains[crtc->pipe] = -modeset_get_crtc_power_domains (new_crtc_state); +modeset_get_crtc_power_domains (new_crtc_state, &put_domains[crtc->pipe]); } }
@@ -8663,7 +8666,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {intel_post_plane_update (state, crtc); -modeset_put_crtc_power_domains (crtc, put_domains[crtc->pipe]); +modeset_put_crtc_power_domains (crtc, &put_domains[crtc->pipe]);intel_modeset_verify_crtc (crtc, state, old_crtc_state, new_crtc_state);
@@ -10502,11 +10505,11 @@ intel_modeset_setup_hw_state(struct drm_device *dev,for_each_intel_crtc (dev, crtc) {struct intel_crtc_state *crtc_state =to_intel_crtc_state (crtc->base.state); -u64 put_domains; +struct intel_power_domain_mask put_domains; - put_domains =modeset_get_crtc_power_domains (crtc_state); -if (drm_WARN_ON (dev, put_domains)) -modeset_put_crtc_power_domains (crtc, put_domains); +modeset_get_crtc_power_domains (crtc_state, &put_domains); +if (drm_WARN_ON (dev, !bitmap_empty (put_domains.bits,POWER_DOMAIN_NUM ))) +modeset_put_crtc_power_domains (crtc, &put_domains); }intel_display_power_put (dev_priv,POWER_DOMAIN_INIT , wakeref);
drivers/gpu/drm/i915/display/intel_display_power.c +64 -44
296 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power.h +11 -7
@@ -139,6 +139,10 @@ enum intel_display_power_domain { ((tran) ==TRANSCODER_EDP ?POWER_DOMAIN_TRANSCODER_EDP : \ (tran) + POWER_DOMAIN_TRANSCODER_A) +struct intel_power_domain_mask { + DECLARE_BITMAP(bits, POWER_DOMAIN_NUM); +}; +struct i915_power_domains {/* * Power wells needed for initialization at driver init and suspend
@@ -156,21 +160,21 @@ struct i915_power_domains {struct delayed_work async_put_work;intel_wakeref_t async_put_wakeref; -u64 async_put_domains[2 ]; +struct intel_power_domain_mask async_put_domains[2 ];struct i915_power_well *power_wells; };struct intel_display_power_domain_set { -u64 mask; +struct intel_power_domain_mask mask;#ifdef CONFIG_DRM_I915_DEBUG_RUNTIME_PM intel_wakeref_t wakerefs[POWER_DOMAIN_NUM ];#endif }; -#define for_each_power_domain (domain, mask) \ - for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \ - for_each_if(BIT_ULL(domain) & (mask)) +#define for_each_power_domain (__domain, __mask) \ + for ((__domain) = 0; (__domain) < POWER_DOMAIN_NUM; (__domain)++) \ + for_each_if(test_bit((__domain), (__mask)->bits))int intel_power_domains_init (struct drm_i915_private *dev_priv);void intel_power_domains_cleanup (struct drm_i915_private *dev_priv);
@@ -251,13 +255,13 @@ intel_display_power_get_in_set_if_enabled(struct drm_i915_private *i915,void intel_display_power_put_mask_in_set (struct drm_i915_private *i915,struct intel_display_power_domain_set *power_domain_set, -u64 mask); +struct intel_power_domain_mask *mask);static inline void intel_display_power_put_all_in_set (struct drm_i915_private *i915,struct intel_display_power_domain_set *power_domain_set) { -intel_display_power_put_mask_in_set (i915, power_domain_set, power_domain_set->mask); +intel_display_power_put_mask_in_set (i915, power_domain_set, &power_domain_set->mask); }void intel_display_power_debug (struct drm_i915_private *i915,struct seq_file *m);
drivers/gpu/drm/i915/display/intel_display_power_map.c +2 -2
@@ -2084,13 +2084,13 @@ static void init_power_well_domains(const struct i915_power_well_desc *desc,return ;if (desc->domain_list->count ==0 ) { - power_well->domains =GENMASK_ULL (POWER_DOMAIN_NUM -1 ,0 ); +bitmap_fill (power_well->domains.bits,POWER_DOMAIN_NUM );return ; }for (j =0 ; j < desc->domain_list->count; j++) - power_well->domains |=BIT_ULL (desc->domain_list->list[j]); +set_bit (desc->domain_list->list[j], power_well->domains.bits); } static int
drivers/gpu/drm/i915/display/intel_display_power_well.c +2 -2
@@ -153,9 +153,9 @@ const char *intel_power_well_name(struct i915_power_well *power_well)return power_well->desc->name; } -u64 intel_power_well_domains (struct i915_power_well *power_well) +struct intel_power_domain_mask *intel_power_well_domains (struct i915_power_well *power_well) { -return power_well->domains; +return &power_well->domains; }int intel_power_well_refcount (struct i915_power_well *power_well)
drivers/gpu/drm/i915/display/intel_display_power_well.h +3 -2
@@ -8,6 +8,7 @@#include <linux/types.h> #include "intel_display.h" +#include "intel_display_power.h" struct drm_i915_private ;struct i915_power_well ;
@@ -102,7 +103,7 @@ struct i915_power_well_desc {struct i915_power_well {const struct i915_power_well_desc *desc; -u64 domains; +struct intel_power_domain_mask domains;/* power well enable/disable usage count */ int count;/* cached hw enabled state */
@@ -129,7 +130,7 @@ bool intel_display_power_well_is_enabled(struct drm_i915_private *dev_priv, enum i915_power_well_id power_well_id);bool intel_power_well_is_always_on (struct i915_power_well *power_well);const char *intel_power_well_name (struct i915_power_well *power_well); -u64 intel_power_well_domains (struct i915_power_well *power_well); +struct intel_power_domain_mask *intel_power_well_domains (struct i915_power_well *power_well);int intel_power_well_refcount (struct i915_power_well *power_well); void chv_phy_powergate_lanes(struct intel_encoder *encoder,
Signature · 1 line
2.30.2
PATCH v3 10/18 drm/i915: Simplify power well definitions by adding power well instances
In reply to Imre DeakAll the port specific AUX/DDI_IO power wells share the same power well ops struct and flags, so we can save some space and simplify the definition of these by listing for all such power wells only the params specific to them (name, domains, power well register index, id). Move these params to a new i915_power_well_instance struct and convert the per-platform power well definitions accordingly.
For all power well instance the name and power domain list params must be specified, while the register index and id are optional, add the I915_PW() macro that both simplifies the definitions and ensures that the required params are set.
--- .../i915/display/intel_display_power_map.c | 1515 +++++------------ .../i915/display/intel_display_power_well.c | 72 +- .../i915/display/intel_display_power_well.h | 48 +- 3 files changed, 505 insertions(+), 1130 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +436 -1079
@@ -30,16 +30,23 @@#define I915_PW_DOMAINS_NONE NULL#define I915_PW_DOMAINS_ALL /* zero-length list */ +#define I915_PW_INSTANCES (...) \ + (const struct i915_power_well_instance_list) \ + __LIST(__LIST_INLINE_ELEMS(struct i915_power_well_instance, __VA_ARGS__)) + +#define I915_PW (_name, _domain_list, ...) \ + { .name = _name, .domain_list = _domain_list, ## __VA_ARGS__ } +I915_DECL_PW_DOMAINS (i9xx_pwdoms_always_on,I915_PW_DOMAINS_ALL );static const struct i915_power_well_desc i9xx_always_on_power_well[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, };
@@ -54,16 +61,16 @@ I915_DECL_PW_DOMAINS(i830_pwdoms_pipes,static const struct i915_power_well_desc i830_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="pipes" , - .domain_list = &i830_pwdoms_pipes, + .instances = &I915_PW_INSTANCES ( + I915_PW("pipes", &i830_pwdoms_pipes), + ), .ops = &i830_pipes_power_well_ops, - .id =DISP_PW_ID_NONE , }, };
@@ -87,20 +94,19 @@ I915_DECL_PW_DOMAINS(hsw_pwdoms_display,static const struct i915_power_well_desc hsw_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="display" , - .domain_list = &hsw_pwdoms_display, + .instances = &I915_PW_INSTANCES ( +I915_PW ("display" , &hsw_pwdoms_display, + .hsw.idx = HSW_PW_CTL_IDX_GLOBAL, + .id = HSW_DISP_PW_GLOBAL), + ), .ops = &hsw_power_well_ops, .has_vga = true, - .id =HSW_DISP_PW_GLOBAL , - { - .hsw.idx =HSW_PW_CTL_IDX_GLOBAL , - }, }, };
@@ -123,21 +129,20 @@ I915_DECL_PW_DOMAINS(bdw_pwdoms_display,static const struct i915_power_well_desc bdw_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="display" , - .domain_list = &bdw_pwdoms_display, + .instances = &I915_PW_INSTANCES ( +I915_PW ("display" , &bdw_pwdoms_display, + .hsw.idx = HSW_PW_CTL_IDX_GLOBAL, + .id = HSW_DISP_PW_GLOBAL), + ), .ops = &hsw_power_well_ops, .has_vga = true, .irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), - .id =HSW_DISP_PW_GLOBAL , - { - .hsw.idx =HSW_PW_CTL_IDX_GLOBAL , - }, }, };
@@ -178,59 +183,37 @@ I915_DECL_PW_DOMAINS(vlv_pwdoms_dpio_tx_bc_lanes,static const struct i915_power_well_desc vlv_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="display" , - .domain_list = &vlv_pwdoms_display, + .instances = &I915_PW_INSTANCES ( +I915_PW ("display" , &vlv_pwdoms_display, + .vlv.idx = PUNIT_PWGT_IDX_DISP2D, + .id = VLV_DISP_PW_DISP2D), + ), .ops = &vlv_display_power_well_ops, - .id =VLV_DISP_PW_DISP2D , - { - .vlv.idx =PUNIT_PWGT_IDX_DISP2D , - }, }, { - .name ="dpio-tx-b-01" , - .domain_list = &vlv_pwdoms_dpio_tx_bc_lanes, + .instances = &I915_PW_INSTANCES ( +I915_PW ("dpio-tx-b-01" , &vlv_pwdoms_dpio_tx_bc_lanes, + .vlv.idx = PUNIT_PWGT_IDX_DPIO_TX_B_LANES_01), +I915_PW ("dpio-tx-b-23" , &vlv_pwdoms_dpio_tx_bc_lanes, + .vlv.idx = PUNIT_PWGT_IDX_DPIO_TX_B_LANES_23), +I915_PW ("dpio-tx-c-01" , &vlv_pwdoms_dpio_tx_bc_lanes, + .vlv.idx = PUNIT_PWGT_IDX_DPIO_TX_C_LANES_01), +I915_PW ("dpio-tx-c-23" , &vlv_pwdoms_dpio_tx_bc_lanes, + .vlv.idx = PUNIT_PWGT_IDX_DPIO_TX_C_LANES_23), + ), .ops = &vlv_dpio_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_B_LANES_01 , - }, }, { - .name ="dpio-tx-b-23" , - .domain_list = &vlv_pwdoms_dpio_tx_bc_lanes, - .ops = &vlv_dpio_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_B_LANES_23 , - }, - }, { - .name ="dpio-tx-c-01" , - .domain_list = &vlv_pwdoms_dpio_tx_bc_lanes, - .ops = &vlv_dpio_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_C_LANES_01 , - }, - }, { - .name ="dpio-tx-c-23" , - .domain_list = &vlv_pwdoms_dpio_tx_bc_lanes, - .ops = &vlv_dpio_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_TX_C_LANES_23 , - }, - }, { - .name ="dpio-common" , - .domain_list = &vlv_pwdoms_dpio_cmn_bc, + .instances = &I915_PW_INSTANCES ( +I915_PW ("dpio-common" , &vlv_pwdoms_dpio_cmn_bc, + .vlv.idx = PUNIT_PWGT_IDX_DPIO_CMN_BC, + .id = VLV_DISP_PW_DPIO_CMN_BC), + ), .ops = &vlv_dpio_cmn_power_well_ops, - .id =VLV_DISP_PW_DPIO_CMN_BC , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_CMN_BC , - }, }, };
@@ -272,37 +255,31 @@ I915_DECL_PW_DOMAINS(chv_pwdoms_dpio_cmn_d,static const struct i915_power_well_desc chv_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="display" ,/* * Pipe A power well is the new disp2d well. Pipe B and C * power wells don't actually exist. Pipe A power well is * required for any pipe to work. */ - .domain_list = &chv_pwdoms_display, + .instances = &I915_PW_INSTANCES ( + I915_PW("display", &chv_pwdoms_display), + ), .ops = &chv_pipe_power_well_ops, - .id =DISP_PW_ID_NONE , }, { - .name ="dpio-common-bc" , - .domain_list = &chv_pwdoms_dpio_cmn_bc, + .instances = &I915_PW_INSTANCES ( +I915_PW ("dpio-common-bc" , &chv_pwdoms_dpio_cmn_bc, + .vlv.idx = PUNIT_PWGT_IDX_DPIO_CMN_BC, + .id = VLV_DISP_PW_DPIO_CMN_BC), +I915_PW ("dpio-common-d" , &chv_pwdoms_dpio_cmn_d, + .vlv.idx = PUNIT_PWGT_IDX_DPIO_CMN_D, + .id = CHV_DISP_PW_DPIO_CMN_D), + ), .ops = &chv_dpio_cmn_power_well_ops, - .id =VLV_DISP_PW_DPIO_CMN_BC , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_CMN_BC , - }, - }, { - .name ="dpio-common-d" , - .domain_list = &chv_pwdoms_dpio_cmn_d, - .ops = &chv_dpio_cmn_power_well_ops, - .id =CHV_DISP_PW_DPIO_CMN_D , - { - .vlv.idx =PUNIT_PWGT_IDX_DPIO_CMN_D , - }, }, };
@@ -355,80 +332,54 @@ I915_DECL_PW_DOMAINS(skl_pwdoms_ddi_io_d,static const struct i915_power_well_desc skl_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="PW_1" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , + .hsw.idx = SKL_PW_CTL_IDX_PW_1, + .id = SKL_DISP_PW_1), + ), .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - .id =SKL_DISP_PW_1 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_1 , - }, }, { - .name ="MISC_IO" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("MISC_IO" ,I915_PW_DOMAINS_NONE , + .hsw.idx = SKL_PW_CTL_IDX_MISC_IO, + .id = SKL_DISP_PW_MISC_IO), + ), .ops = &hsw_power_well_ops, .always_on = true, - .id =SKL_DISP_PW_MISC_IO , - { - .hsw.idx =SKL_PW_CTL_IDX_MISC_IO , - }, }, { - .name ="DC_off" , - .domain_list = &skl_pwdoms_dc_off, + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &skl_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , }, { - .name ="PW_2" , - .domain_list = &skl_pwdoms_pw_2, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_2" , &skl_pwdoms_pw_2, + .hsw.idx = SKL_PW_CTL_IDX_PW_2, + .id = SKL_DISP_PW_2), + ), .ops = &hsw_power_well_ops, .has_vga = true, .irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), .has_fuses = true, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_2 , - }, }, { - .name ="DDI_IO_A_E" , - .domain_list = &skl_pwdoms_ddi_io_a_e, + .instances = &I915_PW_INSTANCES ( + I915_PW("DDI_IO_A_E", &skl_pwdoms_ddi_io_a_e, .hsw.idx = SKL_PW_CTL_IDX_DDI_A_E), + I915_PW("DDI_IO_B", &skl_pwdoms_ddi_io_b, .hsw.idx = SKL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_C", &skl_pwdoms_ddi_io_c, .hsw.idx = SKL_PW_CTL_IDX_DDI_C), + I915_PW("DDI_IO_D", &skl_pwdoms_ddi_io_d, .hsw.idx = SKL_PW_CTL_IDX_DDI_D), + ), .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_A_E , - }, - }, { - .name ="DDI_IO_B" , - .domain_list = &skl_pwdoms_ddi_io_b, - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_B , - }, - }, { - .name ="DDI_IO_C" , - .domain_list = &skl_pwdoms_ddi_io_c, - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_C , - }, - }, { - .name ="DDI_IO_D" , - .domain_list = &skl_pwdoms_ddi_io_d, - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_D , - }, }, };
@@ -474,54 +425,47 @@ I915_DECL_PW_DOMAINS(bxt_pwdoms_dpio_cmn_bc,static const struct i915_power_well_desc bxt_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="PW_1" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , + .hsw.idx = SKL_PW_CTL_IDX_PW_1, + .id = SKL_DISP_PW_1), + ), .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - .id =SKL_DISP_PW_1 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_1 , - }, }, { - .name ="DC_off" , - .domain_list = &bxt_pwdoms_dc_off, + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &bxt_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , }, { - .name ="PW_2" , - .domain_list = &bxt_pwdoms_pw_2, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_2" , &bxt_pwdoms_pw_2, + .hsw.idx = SKL_PW_CTL_IDX_PW_2, + .id = SKL_DISP_PW_2), + ), .ops = &hsw_power_well_ops, .has_vga = true, .irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), .has_fuses = true, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_2 , - }, }, { - .name ="dpio-common-a" , - .domain_list = &bxt_pwdoms_dpio_cmn_a, + .instances = &I915_PW_INSTANCES ( +I915_PW ("dpio-common-a" , &bxt_pwdoms_dpio_cmn_a, + .bxt.phy = DPIO_PHY1, + .id = BXT_DISP_PW_DPIO_CMN_A), +I915_PW ("dpio-common-bc" , &bxt_pwdoms_dpio_cmn_bc, + .bxt.phy = DPIO_PHY0, + .id = VLV_DISP_PW_DPIO_CMN_BC), + ), .ops = &bxt_dpio_cmn_power_well_ops, - .id =BXT_DISP_PW_DPIO_CMN_A , - { - .bxt.phy =DPIO_PHY1 , - }, - }, { - .name ="dpio-common-bc" , - .domain_list = &bxt_pwdoms_dpio_cmn_bc, - .ops = &bxt_dpio_cmn_power_well_ops, - .id =VLV_DISP_PW_DPIO_CMN_BC , - { - .bxt.phy =DPIO_PHY0 , - }, }, };
@@ -587,110 +531,60 @@ I915_DECL_PW_DOMAINS(glk_pwdoms_aux_c,static const struct i915_power_well_desc glk_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="PW_1" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , + .hsw.idx = SKL_PW_CTL_IDX_PW_1, + .id = SKL_DISP_PW_1), + ), .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - .id =SKL_DISP_PW_1 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_1 , - }, }, { - .name ="DC_off" , - .domain_list = &glk_pwdoms_dc_off, + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &glk_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , }, { - .name ="PW_2" , - .domain_list = &glk_pwdoms_pw_2, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_2" , &glk_pwdoms_pw_2, + .hsw.idx = SKL_PW_CTL_IDX_PW_2, + .id = SKL_DISP_PW_2), + ), .ops = &hsw_power_well_ops, .has_vga = true, .irq_pipe_mask =BIT (PIPE_B ) |BIT (PIPE_C ), .has_fuses = true, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =SKL_PW_CTL_IDX_PW_2 , - }, }, { - .name ="dpio-common-a" , - .domain_list = &glk_pwdoms_dpio_cmn_a, + .instances = &I915_PW_INSTANCES ( +I915_PW ("dpio-common-a" , &glk_pwdoms_dpio_cmn_a, + .bxt.phy = DPIO_PHY1, + .id = BXT_DISP_PW_DPIO_CMN_A), +I915_PW ("dpio-common-b" , &glk_pwdoms_dpio_cmn_b, + .bxt.phy = DPIO_PHY0, + .id = VLV_DISP_PW_DPIO_CMN_BC), +I915_PW ("dpio-common-c" , &glk_pwdoms_dpio_cmn_c, + .bxt.phy = DPIO_PHY2, + .id = GLK_DISP_PW_DPIO_CMN_C), + ), .ops = &bxt_dpio_cmn_power_well_ops, - .id =BXT_DISP_PW_DPIO_CMN_A , - { - .bxt.phy =DPIO_PHY1 , - }, }, { - .name ="dpio-common-b" , - .domain_list = &glk_pwdoms_dpio_cmn_b, - .ops = &bxt_dpio_cmn_power_well_ops, - .id =VLV_DISP_PW_DPIO_CMN_BC , - { - .bxt.phy =DPIO_PHY0 , - }, - }, { - .name ="dpio-common-c" , - .domain_list = &glk_pwdoms_dpio_cmn_c, - .ops = &bxt_dpio_cmn_power_well_ops, - .id =GLK_DISP_PW_DPIO_CMN_C , - { - .bxt.phy =DPIO_PHY2 , - }, - }, { - .name ="AUX_A" , - .domain_list = &glk_pwdoms_aux_a, - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =GLK_PW_CTL_IDX_AUX_A , - }, - }, { - .name ="AUX_B" , - .domain_list = &glk_pwdoms_aux_b, - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =GLK_PW_CTL_IDX_AUX_B , - }, - }, { - .name ="AUX_C" , - .domain_list = &glk_pwdoms_aux_c, - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =GLK_PW_CTL_IDX_AUX_C , - }, - }, { - .name ="DDI_IO_A" , - .domain_list = &glk_pwdoms_ddi_io_a, - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =GLK_PW_CTL_IDX_DDI_A , - }, - }, { - .name ="DDI_IO_B" , - .domain_list = &glk_pwdoms_ddi_io_b, - .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_B , - }, - }, { - .name ="DDI_IO_C" , - .domain_list = &glk_pwdoms_ddi_io_c, + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_A", &glk_pwdoms_aux_a, .hsw.idx = GLK_PW_CTL_IDX_AUX_A), + I915_PW("AUX_B", &glk_pwdoms_aux_b, .hsw.idx = GLK_PW_CTL_IDX_AUX_B), + I915_PW("AUX_C", &glk_pwdoms_aux_c, .hsw.idx = GLK_PW_CTL_IDX_AUX_C), + I915_PW("DDI_IO_A", &glk_pwdoms_ddi_io_a, .hsw.idx = GLK_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &glk_pwdoms_ddi_io_b, .hsw.idx = SKL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_C", &glk_pwdoms_ddi_io_c, .hsw.idx = SKL_PW_CTL_IDX_DDI_C), + ), .ops = &hsw_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =SKL_PW_CTL_IDX_DDI_C , - }, }, };
@@ -790,193 +684,82 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt4, POWER_DOMAIN_AUX_TBT_F);static const struct i915_power_well_desc icl_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="PW_1" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , + .hsw.idx = ICL_PW_CTL_IDX_PW_1, + .id = SKL_DISP_PW_1), + ), .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - .id =SKL_DISP_PW_1 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_1 , - }, }, { - .name ="DC_off" , - .domain_list = &icl_pwdoms_dc_off, + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &icl_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , }, { - .name ="PW_2" , - .domain_list = &icl_pwdoms_pw_2, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_2" , &icl_pwdoms_pw_2, + .hsw.idx = ICL_PW_CTL_IDX_PW_2, + .id = SKL_DISP_PW_2), + ), .ops = &hsw_power_well_ops, .has_fuses = true, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_2 , - }, }, { - .name ="PW_3" , - .domain_list = &icl_pwdoms_pw_3, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_3" , &icl_pwdoms_pw_3, + .hsw.idx = ICL_PW_CTL_IDX_PW_3, + .id = ICL_DISP_PW_3), + ), .ops = &hsw_power_well_ops, .has_vga = true, .irq_pipe_mask =BIT (PIPE_B ), .has_fuses = true, - .id =ICL_DISP_PW_3 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_3 , - }, }, { - .name ="DDI_IO_A" , - .domain_list = &icl_pwdoms_ddi_io_a, + .instances = &I915_PW_INSTANCES ( + I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_C", &icl_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), + I915_PW("DDI_IO_D", &icl_pwdoms_ddi_io_d, .hsw.idx = ICL_PW_CTL_IDX_DDI_D), + I915_PW("DDI_IO_E", &icl_pwdoms_ddi_io_e, .hsw.idx = ICL_PW_CTL_IDX_DDI_E), + I915_PW("DDI_IO_F", &icl_pwdoms_ddi_io_f, .hsw.idx = ICL_PW_CTL_IDX_DDI_F), + ), .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - }, }, { - .name ="DDI_IO_B" , - .domain_list = &icl_pwdoms_ddi_io_b, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - }, - }, { - .name ="DDI_IO_C" , - .domain_list = &icl_pwdoms_ddi_io_c, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_C , - }, - }, { - .name ="DDI_IO_D" , - .domain_list = &icl_pwdoms_ddi_io_d, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_D , - }, - }, { - .name ="DDI_IO_E" , - .domain_list = &icl_pwdoms_ddi_io_e, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_E , - }, - }, { - .name ="DDI_IO_F" , - .domain_list = &icl_pwdoms_ddi_io_f, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_F , - }, - }, { - .name ="AUX_A" , - .domain_list = &icl_pwdoms_aux_a, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_A , - }, - }, { - .name ="AUX_B" , - .domain_list = &icl_pwdoms_aux_b, + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_A", &icl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), + I915_PW("AUX_B", &icl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), + I915_PW("AUX_C", &icl_pwdoms_aux_c, .hsw.idx = ICL_PW_CTL_IDX_AUX_C), + I915_PW("AUX_D", &icl_pwdoms_aux_d, .hsw.idx = ICL_PW_CTL_IDX_AUX_D), + I915_PW("AUX_E", &icl_pwdoms_aux_e, .hsw.idx = ICL_PW_CTL_IDX_AUX_E), + I915_PW("AUX_F", &icl_pwdoms_aux_f, .hsw.idx = ICL_PW_CTL_IDX_AUX_F), + ), .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_B , - }, - }, { - .name ="AUX_C" , - .domain_list = &icl_pwdoms_aux_c, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - }, - }, { - .name ="AUX_D" , - .domain_list = &icl_pwdoms_aux_d, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_D , - }, - }, { - .name ="AUX_E" , - .domain_list = &icl_pwdoms_aux_e, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_E , - }, - }, { - .name ="AUX_F" , - .domain_list = &icl_pwdoms_aux_f, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_F , - }, - }, { - .name ="AUX_TBT1" , - .domain_list = &icl_pwdoms_aux_tbt1, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_TBT1 , - }, - }, { - .name ="AUX_TBT2" , - .domain_list = &icl_pwdoms_aux_tbt2, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_TBT2 , - }, - }, { - .name ="AUX_TBT3" , - .domain_list = &icl_pwdoms_aux_tbt3, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_TBT3 , - }, }, { - .name ="AUX_TBT4" , - .domain_list = &icl_pwdoms_aux_tbt4, + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_TBT1", &icl_pwdoms_aux_tbt1, .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT1), + I915_PW("AUX_TBT2", &icl_pwdoms_aux_tbt2, .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT2), + I915_PW("AUX_TBT3", &icl_pwdoms_aux_tbt3, .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT3), + I915_PW("AUX_TBT4", &icl_pwdoms_aux_tbt4, .hsw.idx = ICL_PW_CTL_IDX_AUX_TBT4), + ), .ops = &icl_aux_power_well_ops, .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_TBT4 , - }, }, { - .name ="PW_4" , - .domain_list = &icl_pwdoms_pw_4, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_4" , &icl_pwdoms_pw_4, + .hsw.idx = ICL_PW_CTL_IDX_PW_4), + ), .ops = &hsw_power_well_ops, .irq_pipe_mask =BIT (PIPE_C ), .has_fuses = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_4 , - }, }, };
@@ -1087,276 +870,104 @@ I915_DECL_PW_DOMAINS(tgl_pwdoms_tc_cold_off,static const struct i915_power_well_desc tgl_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="PW_1" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , + .hsw.idx = ICL_PW_CTL_IDX_PW_1, + .id = SKL_DISP_PW_1), + ), .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - .id =SKL_DISP_PW_1 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_1 , - }, }, { - .name ="DC_off" , - .domain_list = &tgl_pwdoms_dc_off, + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &tgl_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , }, { - .name ="PW_2" , - .domain_list = &tgl_pwdoms_pw_2, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_2" , &tgl_pwdoms_pw_2, + .hsw.idx = ICL_PW_CTL_IDX_PW_2, + .id = SKL_DISP_PW_2), + ), .ops = &hsw_power_well_ops, .has_fuses = true, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_2 , - }, }, { - .name ="PW_3" , - .domain_list = &tgl_pwdoms_pw_3, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_3" , &tgl_pwdoms_pw_3, + .hsw.idx = ICL_PW_CTL_IDX_PW_3, + .id = ICL_DISP_PW_3), + ), .ops = &hsw_power_well_ops, .has_vga = true, .irq_pipe_mask =BIT (PIPE_B ), .has_fuses = true, - .id =ICL_DISP_PW_3 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_3 , - }, }, { - .name ="DDI_IO_A" , - .domain_list = &icl_pwdoms_ddi_io_a, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - } - }, { - .name ="DDI_IO_B" , - .domain_list = &icl_pwdoms_ddi_io_b, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - } - }, { - .name ="DDI_IO_C" , - .domain_list = &icl_pwdoms_ddi_io_c, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_C , - } - }, { - .name ="DDI_IO_TC1" , - .domain_list = &tgl_pwdoms_ddi_io_tc1, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , - }, - }, { - .name ="DDI_IO_TC2" , - .domain_list = &tgl_pwdoms_ddi_io_tc2, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC2 , - }, - }, { - .name ="DDI_IO_TC3" , - .domain_list = &tgl_pwdoms_ddi_io_tc3, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC3 , - }, - }, { - .name ="DDI_IO_TC4" , - .domain_list = &tgl_pwdoms_ddi_io_tc4, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC4 , - }, - }, { - .name ="DDI_IO_TC5" , - .domain_list = &tgl_pwdoms_ddi_io_tc5, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC5 , - }, - }, { - .name ="DDI_IO_TC6" , - .domain_list = &tgl_pwdoms_ddi_io_tc6, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC6 , - }, - }, { - .name ="TC_cold_off" , - .domain_list = &tgl_pwdoms_tc_cold_off, + .instances = &I915_PW_INSTANCES ( + I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_C", &icl_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), + I915_PW("DDI_IO_TC1", &tgl_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), + I915_PW("DDI_IO_TC2", &tgl_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), + I915_PW("DDI_IO_TC3", &tgl_pwdoms_ddi_io_tc3, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC3), + I915_PW("DDI_IO_TC4", &tgl_pwdoms_ddi_io_tc4, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC4), + I915_PW("DDI_IO_TC5", &tgl_pwdoms_ddi_io_tc5, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC5), + I915_PW("DDI_IO_TC6", &tgl_pwdoms_ddi_io_tc6, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC6), + ), + .ops = &icl_ddi_power_well_ops, + }, { + .instances = &I915_PW_INSTANCES ( +I915_PW ("TC_cold_off" , &tgl_pwdoms_tc_cold_off, + .id = TGL_DISP_PW_TC_COLD_OFF), + ), .ops = &tgl_tc_cold_off_ops, - .id =TGL_DISP_PW_TC_COLD_OFF , }, { - .name ="AUX_A" , - .domain_list = &tgl_pwdoms_aux_a, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_A , - }, - }, { - .name ="AUX_B" , - .domain_list = &tgl_pwdoms_aux_b, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_B , - }, - }, { - .name ="AUX_C" , - .domain_list = &tgl_pwdoms_aux_c, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - }, - }, { - .name ="AUX_USBC1" , - .domain_list = &tgl_pwdoms_aux_usbc1, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC1 , - }, - }, { - .name ="AUX_USBC2" , - .domain_list = &tgl_pwdoms_aux_usbc2, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC2 , - }, - }, { - .name ="AUX_USBC3" , - .domain_list = &tgl_pwdoms_aux_usbc3, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC3 , - }, - }, { - .name ="AUX_USBC4" , - .domain_list = &tgl_pwdoms_aux_usbc4, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC4 , - }, - }, { - .name ="AUX_USBC5" , - .domain_list = &tgl_pwdoms_aux_usbc5, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC5 , - }, - }, { - .name ="AUX_USBC6" , - .domain_list = &tgl_pwdoms_aux_usbc6, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC6 , - }, - }, { - .name ="AUX_TBT1" , - .domain_list = &tgl_pwdoms_aux_tbt1, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT1 , - }, - }, { - .name ="AUX_TBT2" , - .domain_list = &tgl_pwdoms_aux_tbt2, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT2 , - }, - }, { - .name ="AUX_TBT3" , - .domain_list = &tgl_pwdoms_aux_tbt3, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT3 , - }, - }, { - .name ="AUX_TBT4" , - .domain_list = &tgl_pwdoms_aux_tbt4, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT4 , - }, - }, { - .name ="AUX_TBT5" , - .domain_list = &tgl_pwdoms_aux_tbt5, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT5 , - }, - }, { - .name ="AUX_TBT6" , - .domain_list = &tgl_pwdoms_aux_tbt6, + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_A", &tgl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), + I915_PW("AUX_B", &tgl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), + I915_PW("AUX_C", &tgl_pwdoms_aux_c, .hsw.idx = ICL_PW_CTL_IDX_AUX_C), + I915_PW("AUX_USBC1", &tgl_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), + I915_PW("AUX_USBC2", &tgl_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), + I915_PW("AUX_USBC3", &tgl_pwdoms_aux_usbc3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3), + I915_PW("AUX_USBC4", &tgl_pwdoms_aux_usbc4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC4), + I915_PW("AUX_USBC5", &tgl_pwdoms_aux_usbc5, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC5), + I915_PW("AUX_USBC6", &tgl_pwdoms_aux_usbc6, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC6), + ), + .ops = &icl_aux_power_well_ops, + }, { + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_TBT1", &tgl_pwdoms_aux_tbt1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1), + I915_PW("AUX_TBT2", &tgl_pwdoms_aux_tbt2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2), + I915_PW("AUX_TBT3", &tgl_pwdoms_aux_tbt3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3), + I915_PW("AUX_TBT4", &tgl_pwdoms_aux_tbt4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4), + I915_PW("AUX_TBT5", &tgl_pwdoms_aux_tbt5, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT5), + I915_PW("AUX_TBT6", &tgl_pwdoms_aux_tbt6, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT6), + ), .ops = &icl_aux_power_well_ops, .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT6 , - }, }, { - .name ="PW_4" , - .domain_list = &tgl_pwdoms_pw_4, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_4" , &tgl_pwdoms_pw_4, + .hsw.idx = ICL_PW_CTL_IDX_PW_4), + ), .ops = &hsw_power_well_ops, .has_fuses = true, .irq_pipe_mask =BIT (PIPE_C ), - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_4 , - } }, { - .name ="PW_5" , - .domain_list = &tgl_pwdoms_pw_5, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_5" , &tgl_pwdoms_pw_5, + .hsw.idx = TGL_PW_CTL_IDX_PW_5), + ), .ops = &hsw_power_well_ops, .has_fuses = true, .irq_pipe_mask =BIT (PIPE_D ), - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_PW_5 , - }, }, };
@@ -1416,112 +1027,61 @@ I915_DECL_PW_DOMAINS(rkl_pwdoms_dc_off,static const struct i915_power_well_desc rkl_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="PW_1" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , + .hsw.idx = ICL_PW_CTL_IDX_PW_1, + .id = SKL_DISP_PW_1), + ), .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - .id =SKL_DISP_PW_1 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_1 , - }, }, { - .name ="DC_off" , - .domain_list = &rkl_pwdoms_dc_off, + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &rkl_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , }, { - .name ="PW_3" , - .domain_list = &rkl_pwdoms_pw_3, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_3" , &rkl_pwdoms_pw_3, + .hsw.idx = ICL_PW_CTL_IDX_PW_3, + .id = ICL_DISP_PW_3), + ), .ops = &hsw_power_well_ops, .irq_pipe_mask =BIT (PIPE_B ), .has_vga = true, .has_fuses = true, - .id =ICL_DISP_PW_3 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_3 , - }, }, { - .name ="PW_4" , - .domain_list = &rkl_pwdoms_pw_4, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_4" , &rkl_pwdoms_pw_4, + .hsw.idx = ICL_PW_CTL_IDX_PW_4), + ), .ops = &hsw_power_well_ops, .has_fuses = true, .irq_pipe_mask =BIT (PIPE_C ), - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_4 , - } }, { - .name ="DDI_IO_A" , - .domain_list = &icl_pwdoms_ddi_io_a, + .instances = &I915_PW_INSTANCES ( + I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_TC1", &tgl_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), + I915_PW("DDI_IO_TC2", &tgl_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), + ), .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - } }, { - .name ="DDI_IO_B" , - .domain_list = &icl_pwdoms_ddi_io_b, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - } - }, { - .name ="DDI_IO_TC1" , - .domain_list = &tgl_pwdoms_ddi_io_tc1, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , - }, - }, { - .name ="DDI_IO_TC2" , - .domain_list = &tgl_pwdoms_ddi_io_tc2, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC2 , - }, - }, { - .name ="AUX_A" , - .domain_list = &icl_pwdoms_aux_a, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_A , - }, - }, { - .name ="AUX_B" , - .domain_list = &icl_pwdoms_aux_b, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_B , - }, - }, { - .name ="AUX_USBC1" , - .domain_list = &tgl_pwdoms_aux_usbc1, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC1 , - }, - }, { - .name ="AUX_USBC2" , - .domain_list = &tgl_pwdoms_aux_usbc2, + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_A", &icl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), + I915_PW("AUX_B", &icl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), + I915_PW("AUX_USBC1", &tgl_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), + I915_PW("AUX_USBC2", &tgl_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), + ), .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC2 , - }, }, };
@@ -1559,133 +1119,77 @@ I915_DECL_PW_DOMAINS(dg1_pwdoms_pw_2,static const struct i915_power_well_desc dg1_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="PW_1" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , + .hsw.idx = ICL_PW_CTL_IDX_PW_1, + .id = SKL_DISP_PW_1), + ), .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - .id =SKL_DISP_PW_1 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_1 , - }, }, { - .name ="DC_off" , - .domain_list = &dg1_pwdoms_dc_off, + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &dg1_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , }, { - .name ="PW_2" , - .domain_list = &dg1_pwdoms_pw_2, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_2" , &dg1_pwdoms_pw_2, + .hsw.idx = ICL_PW_CTL_IDX_PW_2, + .id = SKL_DISP_PW_2), + ), .ops = &hsw_power_well_ops, .has_fuses = true, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_2 , - }, }, { - .name ="PW_3" , - .domain_list = &dg1_pwdoms_pw_3, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_3" , &dg1_pwdoms_pw_3, + .hsw.idx = ICL_PW_CTL_IDX_PW_3, + .id = ICL_DISP_PW_3), + ), .ops = &hsw_power_well_ops, .irq_pipe_mask =BIT (PIPE_B ), .has_vga = true, .has_fuses = true, - .id =ICL_DISP_PW_3 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_3 , - }, }, { - .name ="DDI_IO_A" , - .domain_list = &icl_pwdoms_ddi_io_a, + .instances = &I915_PW_INSTANCES ( + I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_TC1", &tgl_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), + I915_PW("DDI_IO_TC2", &tgl_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), + ), .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - } }, { - .name ="DDI_IO_B" , - .domain_list = &icl_pwdoms_ddi_io_b, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - } - }, { - .name ="DDI_IO_TC1" , - .domain_list = &tgl_pwdoms_ddi_io_tc1, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , - }, - }, { - .name ="DDI_IO_TC2" , - .domain_list = &tgl_pwdoms_ddi_io_tc2, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC2 , - }, - }, { - .name ="AUX_A" , - .domain_list = &tgl_pwdoms_aux_a, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_A , - }, - }, { - .name ="AUX_B" , - .domain_list = &tgl_pwdoms_aux_b, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_B , - }, - }, { - .name ="AUX_USBC1" , - .domain_list = &tgl_pwdoms_aux_usbc1, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC1 , - }, - }, { - .name ="AUX_USBC2" , - .domain_list = &tgl_pwdoms_aux_usbc2, + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_A", &tgl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), + I915_PW("AUX_B", &tgl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), + I915_PW("AUX_USBC1", &tgl_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), + I915_PW("AUX_USBC2", &tgl_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), + ), .ops = &icl_aux_power_well_ops, - .is_tc_tbt = false, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC2 , - }, }, { - .name ="PW_4" , - .domain_list = &tgl_pwdoms_pw_4, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_4" , &tgl_pwdoms_pw_4, + .hsw.idx = ICL_PW_CTL_IDX_PW_4), + ), .ops = &hsw_power_well_ops, .has_fuses = true, .irq_pipe_mask =BIT (PIPE_C ), - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_4 , - } }, { - .name ="PW_5" , - .domain_list = &tgl_pwdoms_pw_5, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_5" , &tgl_pwdoms_pw_5, + .hsw.idx = TGL_PW_CTL_IDX_PW_5), + ), .ops = &hsw_power_well_ops, .has_fuses = true, .irq_pipe_mask =BIT (PIPE_D ), - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_PW_5 , - }, }, };
@@ -1816,283 +1320,131 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_ddi_io_tc4, POWER_DOMAIN_PORT_DDI_IO_TC4);static const struct i915_power_well_desc xelpd_power_wells[] = { { - .name ="always-on" , - .domain_list = &i9xx_pwdoms_always_on, + .instances = &I915_PW_INSTANCES ( + I915_PW("always-on", &i9xx_pwdoms_always_on), + ), .ops = &i9xx_always_on_power_well_ops, .always_on = true, - .id =DISP_PW_ID_NONE , }, { - .name ="PW_1" ,/* Handled by the DMC firmware */ - .domain_list =I915_PW_DOMAINS_NONE , + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , + .hsw.idx = ICL_PW_CTL_IDX_PW_1, + .id = SKL_DISP_PW_1), + ), .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - .id =SKL_DISP_PW_1 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_1 , - }, }, { - .name ="DC_off" , - .domain_list = &xelpd_pwdoms_dc_off, + .instances = &I915_PW_INSTANCES ( +I915_PW ("DC_off" , &xelpd_pwdoms_dc_off, + .id = SKL_DISP_DC_OFF), + ), .ops = &gen9_dc_off_power_well_ops, - .id =SKL_DISP_DC_OFF , }, { - .name ="PW_2" , - .domain_list = &xelpd_pwdoms_pw_2, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_2" , &xelpd_pwdoms_pw_2, + .hsw.idx = ICL_PW_CTL_IDX_PW_2, + .id = SKL_DISP_PW_2), + ), .ops = &hsw_power_well_ops, .has_vga = true, .has_fuses = true, - .id =SKL_DISP_PW_2 , - { - .hsw.idx =ICL_PW_CTL_IDX_PW_2 , - }, }, { - .name ="PW_A" , - .domain_list = &xelpd_pwdoms_pw_a, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_A" , &xelpd_pwdoms_pw_a, + .hsw.idx = XELPD_PW_CTL_IDX_PW_A), + ), .ops = &hsw_power_well_ops, .irq_pipe_mask =BIT (PIPE_A ), .has_fuses = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_PW_A , - }, }, { - .name ="PW_B" , - .domain_list = &xelpd_pwdoms_pw_b, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_B" , &xelpd_pwdoms_pw_b, + .hsw.idx = XELPD_PW_CTL_IDX_PW_B), + ), .ops = &hsw_power_well_ops, .irq_pipe_mask =BIT (PIPE_B ), .has_fuses = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_PW_B , - }, }, { - .name ="PW_C" , - .domain_list = &xelpd_pwdoms_pw_c, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_C" , &xelpd_pwdoms_pw_c, + .hsw.idx = XELPD_PW_CTL_IDX_PW_C), + ), .ops = &hsw_power_well_ops, .irq_pipe_mask =BIT (PIPE_C ), .has_fuses = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_PW_C , - }, }, { - .name ="PW_D" , - .domain_list = &xelpd_pwdoms_pw_d, + .instances = &I915_PW_INSTANCES ( +I915_PW ("PW_D" , &xelpd_pwdoms_pw_d, + .hsw.idx = XELPD_PW_CTL_IDX_PW_D), + ), .ops = &hsw_power_well_ops, .irq_pipe_mask =BIT (PIPE_D ), .has_fuses = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_PW_D , - }, }, { - .name ="DDI_IO_A" , - .domain_list = &icl_pwdoms_ddi_io_a, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_A , - } - }, { - .name ="DDI_IO_B" , - .domain_list = &icl_pwdoms_ddi_io_b, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_B , - } - }, { - .name ="DDI_IO_C" , - .domain_list = &icl_pwdoms_ddi_io_c, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_DDI_C , - } - }, { - .name ="DDI_IO_D_XELPD" , - .domain_list = &xelpd_pwdoms_ddi_io_d_xelpd, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_DDI_D , - } - }, { - .name ="DDI_IO_E_XELPD" , - .domain_list = &xelpd_pwdoms_ddi_io_e_xelpd, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_DDI_E , - } - }, { - .name ="DDI_IO_TC1" , - .domain_list = &xelpd_pwdoms_ddi_io_tc1, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC1 , - } - }, { - .name ="DDI_IO_TC2" , - .domain_list = &xelpd_pwdoms_ddi_io_tc2, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC2 , - } - }, { - .name ="DDI_IO_TC3" , - .domain_list = &xelpd_pwdoms_ddi_io_tc3, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC3 , - } - }, { - .name ="DDI_IO_TC4" , - .domain_list = &xelpd_pwdoms_ddi_io_tc4, - .ops = &icl_ddi_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_DDI_TC4 , - } - }, { - .name ="AUX_A" , - .domain_list = &icl_pwdoms_aux_a, - .ops = &icl_aux_power_well_ops, - .fixed_enable_delay = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_A , - }, - }, { - .name ="AUX_B" , - .domain_list = &icl_pwdoms_aux_b, - .ops = &icl_aux_power_well_ops, - .fixed_enable_delay = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_B , - }, - }, { - .name ="AUX_C" , - .domain_list = &tgl_pwdoms_aux_c, + .instances = &I915_PW_INSTANCES ( + I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_C", &icl_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), + I915_PW("DDI_IO_D_XELPD", &xelpd_pwdoms_ddi_io_d_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_DDI_D), + I915_PW("DDI_IO_E_XELPD", &xelpd_pwdoms_ddi_io_e_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_DDI_E), + I915_PW("DDI_IO_TC1", &xelpd_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), + I915_PW("DDI_IO_TC2", &xelpd_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), + I915_PW("DDI_IO_TC3", &xelpd_pwdoms_ddi_io_tc3, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC3), + I915_PW("DDI_IO_TC4", &xelpd_pwdoms_ddi_io_tc4, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC4), + ), + .ops = &icl_ddi_power_well_ops, + }, { + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_A", &icl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), + I915_PW("AUX_B", &icl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), + I915_PW("AUX_C", &tgl_pwdoms_aux_c, .hsw.idx = ICL_PW_CTL_IDX_AUX_C), + I915_PW("AUX_D_XELPD", &xelpd_pwdoms_aux_d_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_AUX_D), + I915_PW("AUX_E_XELPD", &xelpd_pwdoms_aux_e_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_AUX_E), + I915_PW("AUX_USBC1", &xelpd_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), + I915_PW("AUX_USBC2", &xelpd_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), + I915_PW("AUX_USBC3", &xelpd_pwdoms_aux_usbc3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3), + I915_PW("AUX_USBC4", &xelpd_pwdoms_aux_usbc4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC4), + ), .ops = &icl_aux_power_well_ops, .fixed_enable_delay = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =ICL_PW_CTL_IDX_AUX_C , - }, - }, { - .name ="AUX_D_XELPD" , - .domain_list = &xelpd_pwdoms_aux_d_xelpd, - .ops = &icl_aux_power_well_ops, - .fixed_enable_delay = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_AUX_D , - }, - }, { - .name ="AUX_E_XELPD" , - .domain_list = &xelpd_pwdoms_aux_e_xelpd, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =XELPD_PW_CTL_IDX_AUX_E , - }, - }, { - .name ="AUX_USBC1" , - .domain_list = &xelpd_pwdoms_aux_usbc1, - .ops = &icl_aux_power_well_ops, - .fixed_enable_delay = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC1 , - }, - }, { - .name ="AUX_USBC2" , - .domain_list = &xelpd_pwdoms_aux_usbc2, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC2 , - }, - }, { - .name ="AUX_USBC3" , - .domain_list = &xelpd_pwdoms_aux_usbc3, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC3 , - }, - }, { - .name ="AUX_USBC4" , - .domain_list = &xelpd_pwdoms_aux_usbc4, - .ops = &icl_aux_power_well_ops, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TC4 , - }, - }, { - .name ="AUX_TBT1" , - .domain_list = &xelpd_pwdoms_aux_tbt1, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT1 , - }, - }, { - .name ="AUX_TBT2" , - .domain_list = &xelpd_pwdoms_aux_tbt2, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT2 , - }, - }, { - .name ="AUX_TBT3" , - .domain_list = &xelpd_pwdoms_aux_tbt3, - .ops = &icl_aux_power_well_ops, - .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT3 , - }, }, { - .name ="AUX_TBT4" , - .domain_list = &xelpd_pwdoms_aux_tbt4, + .instances = &I915_PW_INSTANCES ( + I915_PW("AUX_TBT1", &xelpd_pwdoms_aux_tbt1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1), + I915_PW("AUX_TBT2", &xelpd_pwdoms_aux_tbt2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2), + I915_PW("AUX_TBT3", &xelpd_pwdoms_aux_tbt3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3), + I915_PW("AUX_TBT4", &xelpd_pwdoms_aux_tbt4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4), + ), .ops = &icl_aux_power_well_ops, .is_tc_tbt = true, - .id =DISP_PW_ID_NONE , - { - .hsw.idx =TGL_PW_CTL_IDX_AUX_TBT4 , - }, }, }; -static void init_power_well_domains (const struct i915_power_well_desc *desc, +static void init_power_well_domains (const struct i915_power_well_instance *inst,struct i915_power_well *power_well) {int j; -if (!desc->domain_list) +if (!inst->domain_list)return ; -if (desc->domain_list->count ==0 ) { +if (inst->domain_list->count ==0 ) {bitmap_fill (power_well->domains.bits,POWER_DOMAIN_NUM );return ; } -for (j =0 ; j < desc->domain_list->count; j++) -set_bit (desc->domain_list->list[j], power_well->domains.bits); +for (j =0 ; j < inst->domain_list->count; j++) +set_bit (inst->domain_list->list[j], power_well->domains.bits); } +#define for_each_power_well_instance (_desc_list, _desc_count, _desc, _inst) \ + for ((_desc) = (_desc_list); (_desc) - (_desc_list) < (_desc_count); (_desc)++) \ + for ((_inst) = (_desc)->instances->list; \ + (_inst) - (_desc)->instances->list < (_desc)->instances->count; \ + (_inst)++) + static int __set_power_wells(struct i915_power_domains *power_domains, const struct i915_power_well_desc *power_well_descs,
@@ -2102,11 +1454,13 @@ __set_power_wells(struct i915_power_domains *power_domains, struct drm_i915_private, power_domains);u64 power_well_ids =0 ; +const struct i915_power_well_desc *desc; +const struct i915_power_well_instance *inst;int power_well_count =0 ; -int i, plt_idx =0 ; +int plt_idx =0 ; -for (i =0 ; i < power_well_descs_sz; i++) -if (!(BIT_ULL (power_well_descs[i].id) & skip_mask)) +for_each_power_well_instance (power_well_descs, power_well_descs_sz, desc, inst) +if (!(BIT_ULL (inst->id) & skip_mask)) power_well_count++; power_domains->power_well_count = power_well_count;
@@ -2117,16 +1471,19 @@ __set_power_wells(struct i915_power_domains *power_domains,if (!power_domains->power_wells)return -ENOMEM ; -for (i =0 ; i < power_well_descs_sz; i++) { -enum i915_power_well_id id = power_well_descs[i].id; +for_each_power_well_instance (power_well_descs, power_well_descs_sz, desc, inst) { +struct i915_power_well *pw = &power_domains->power_wells[plt_idx]; +enum i915_power_well_id id = inst->id;if (BIT_ULL (id) & skip_mask)continue ; - power_domains->power_wells[plt_idx].desc = - &power_well_descs[i]; + pw->desc = desc; +drm_WARN_ON (&i915->drm, +overflows_type (inst - desc->instances->list, pw->instance_idx)); + pw->instance_idx = inst - desc->instances->list; -init_power_well_domains (&power_well_descs[i], &power_domains->power_wells[plt_idx]); +init_power_well_domains (inst, pw); plt_idx++;
drivers/gpu/drm/i915/display/intel_display_power_well.c +40 -32
245 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_well.h +29 -19
78 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH v3 11/18 drm/i915: Allow platforms to share power well descriptors
In reply to Imre DeakSome power wells - like always-on and skl+/icl+ PW_1 - with the same name, domain list, flags, ops are used by multiple platforms, so allow platforms to reuse the descriptors of such power wells.
This change also lets the follow up patches to simplify the DG1/RKL power well definitions, and remove the ADL-S skip_mask special casing.
--- .../i915/display/intel_display_power_map.c | 281 ++++++++---------- 1 file changed, 122 insertions(+), 159 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +122 -159
@@ -38,9 +38,17 @@ { .name = _name, .domain_list = _domain_list, ## __VA_ARGS__ } +struct i915_power_well_desc_list { +const struct i915_power_well_desc *list; +u8 count; +}; + +#define I915_PW_DESCRIPTORS (x) __LIST(x) + +I915_DECL_PW_DOMAINS (i9xx_pwdoms_always_on,I915_PW_DOMAINS_ALL ); -static const struct i915_power_well_desc i9xx_always_on_power_well[] = { +static const struct i915_power_well_desc i9xx_power_wells_always_on[] = { { .instances = &I915_PW_INSTANCES( I915_PW("always-on", &i9xx_pwdoms_always_on),
@@ -50,6 +58,10 @@ static const struct i915_power_well_desc i9xx_always_on_power_well[] = { }, }; +static const struct i915_power_well_desc_list i9xx_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +}; + I915_DECL_PW_DOMAINS(i830_pwdoms_pipes, POWER_DOMAIN_PIPE_A, POWER_DOMAIN_PIPE_B,
@@ -59,14 +71,8 @@ I915_DECL_PW_DOMAINS(i830_pwdoms_pipes,POWER_DOMAIN_TRANSCODER_B , POWER_DOMAIN_INIT); -static const struct i915_power_well_desc i830_power_wells[] = { +static const struct i915_power_well_desc i830_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { .instances = &I915_PW_INSTANCES ( I915_PW("pipes", &i830_pwdoms_pipes), ),
@@ -74,6 +80,11 @@ static const struct i915_power_well_desc i830_power_wells[] = { }, }; +static const struct i915_power_well_desc_list i830_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (i830_power_wells_main), +}; + I915_DECL_PW_DOMAINS(hsw_pwdoms_display, POWER_DOMAIN_PIPE_B, POWER_DOMAIN_PIPE_C,
@@ -92,14 +103,8 @@ I915_DECL_PW_DOMAINS(hsw_pwdoms_display, POWER_DOMAIN_AUDIO_PLAYBACK, POWER_DOMAIN_INIT); -static const struct i915_power_well_desc hsw_power_wells[] = { +static const struct i915_power_well_desc hsw_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("display", &hsw_pwdoms_display, .hsw.idx = HSW_PW_CTL_IDX_GLOBAL,
@@ -110,6 +115,11 @@ static const struct i915_power_well_desc hsw_power_wells[] = { }, }; +static const struct i915_power_well_desc_list hsw_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (hsw_power_wells_main), +}; + I915_DECL_PW_DOMAINS(bdw_pwdoms_display, POWER_DOMAIN_PIPE_B, POWER_DOMAIN_PIPE_C,
@@ -127,14 +137,8 @@ I915_DECL_PW_DOMAINS(bdw_pwdoms_display, POWER_DOMAIN_AUDIO_PLAYBACK, POWER_DOMAIN_INIT); -static const struct i915_power_well_desc bdw_power_wells[] = { +static const struct i915_power_well_desc bdw_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("display", &bdw_pwdoms_display, .hsw.idx = HSW_PW_CTL_IDX_GLOBAL,
@@ -146,6 +150,11 @@ static const struct i915_power_well_desc bdw_power_wells[] = { }, }; +static const struct i915_power_well_desc_list bdw_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (bdw_power_wells_main), +}; + I915_DECL_PW_DOMAINS(vlv_pwdoms_display, POWER_DOMAIN_DISPLAY_CORE, POWER_DOMAIN_PIPE_A,
@@ -181,14 +190,8 @@ I915_DECL_PW_DOMAINS(vlv_pwdoms_dpio_tx_bc_lanes, POWER_DOMAIN_AUX_C, POWER_DOMAIN_INIT); -static const struct i915_power_well_desc vlv_power_wells[] = { +static const struct i915_power_well_desc vlv_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("display", &vlv_pwdoms_display, .vlv.idx = PUNIT_PWGT_IDX_DISP2D,
@@ -217,6 +220,11 @@ static const struct i915_power_well_desc vlv_power_wells[] = { }, }; +static const struct i915_power_well_desc_list vlv_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (vlv_power_wells_main), +}; + I915_DECL_PW_DOMAINS(chv_pwdoms_display, POWER_DOMAIN_DISPLAY_CORE, POWER_DOMAIN_PIPE_A,
@@ -253,14 +261,8 @@ I915_DECL_PW_DOMAINS(chv_pwdoms_dpio_cmn_d,POWER_DOMAIN_AUX_D , POWER_DOMAIN_INIT); -static const struct i915_power_well_desc chv_power_wells[] = { +static const struct i915_power_well_desc chv_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, {/* * Pipe A power well is the new disp2d well. Pipe B and C * power wells don't actually exist. Pipe A power well is
@@ -283,6 +285,11 @@ static const struct i915_power_well_desc chv_power_wells[] = { }, }; +static const struct i915_power_well_desc_list chv_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (chv_power_wells_main), +}; +#define SKL_PW_2_POWER_DOMAINS \ POWER_DOMAIN_PIPE_B, \ POWER_DOMAIN_PIPE_C, \
@@ -330,14 +337,8 @@ I915_DECL_PW_DOMAINS(skl_pwdoms_ddi_io_d, POWER_DOMAIN_PORT_DDI_IO_D, POWER_DOMAIN_INIT); -static const struct i915_power_well_desc skl_power_wells[] = { +static const struct i915_power_well_desc skl_power_wells_pw_1[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, {/* Handled by the DMC firmware */ .instances = &I915_PW_INSTANCES( I915_PW("PW_1", I915_PW_DOMAINS_NONE,
@@ -347,7 +348,11 @@ static const struct i915_power_well_desc skl_power_wells[] = { .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - }, { + }, +}; + +static const struct i915_power_well_desc skl_power_wells_main[] = { + {/* Handled by the DMC firmware */ .instances = &I915_PW_INSTANCES( I915_PW("MISC_IO", I915_PW_DOMAINS_NONE,
@@ -383,6 +388,12 @@ static const struct i915_power_well_desc skl_power_wells[] = { }, }; +static const struct i915_power_well_desc_list skl_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (skl_power_wells_pw_1), +I915_PW_DESCRIPTORS (skl_power_wells_main), +}; +#define BXT_PW_2_POWER_DOMAINS \ POWER_DOMAIN_PIPE_B, \ POWER_DOMAIN_PIPE_C, \
@@ -423,24 +434,8 @@ I915_DECL_PW_DOMAINS(bxt_pwdoms_dpio_cmn_bc, POWER_DOMAIN_AUX_C, POWER_DOMAIN_INIT); -static const struct i915_power_well_desc bxt_power_wells[] = { +static const struct i915_power_well_desc bxt_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { -/* Handled by the DMC firmware */ - .instances = &I915_PW_INSTANCES ( -I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , - .hsw.idx = SKL_PW_CTL_IDX_PW_1, - .id = SKL_DISP_PW_1), - ), - .ops = &hsw_power_well_ops, - .always_on = true, - .has_fuses = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("DC_off", &bxt_pwdoms_dc_off, .id = SKL_DISP_DC_OFF),
@@ -469,6 +464,12 @@ static const struct i915_power_well_desc bxt_power_wells[] = { }, }; +static const struct i915_power_well_desc_list bxt_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (skl_power_wells_pw_1), +I915_PW_DESCRIPTORS (bxt_power_wells_main), +}; +#define GLK_PW_2_POWER_DOMAINS \ POWER_DOMAIN_PIPE_B, \ POWER_DOMAIN_PIPE_C, \
@@ -529,24 +530,8 @@ I915_DECL_PW_DOMAINS(glk_pwdoms_aux_c, POWER_DOMAIN_AUX_C, POWER_DOMAIN_INIT); -static const struct i915_power_well_desc glk_power_wells[] = { +static const struct i915_power_well_desc glk_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { -/* Handled by the DMC firmware */ - .instances = &I915_PW_INSTANCES ( -I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , - .hsw.idx = SKL_PW_CTL_IDX_PW_1, - .id = SKL_DISP_PW_1), - ), - .ops = &hsw_power_well_ops, - .always_on = true, - .has_fuses = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("DC_off", &glk_pwdoms_dc_off, .id = SKL_DISP_DC_OFF),
@@ -588,6 +573,12 @@ static const struct i915_power_well_desc glk_power_wells[] = { }, }; +static const struct i915_power_well_desc_list glk_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (skl_power_wells_pw_1), +I915_PW_DESCRIPTORS (glk_power_wells_main), +}; +/* * ICL PW_0/PG_0 domains (HW/DMC control): * - PCI
@@ -682,14 +673,8 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_aux_tbt2, POWER_DOMAIN_AUX_TBT_D);I915_DECL_PW_DOMAINS (icl_pwdoms_aux_tbt3,POWER_DOMAIN_AUX_TBT_E );I915_DECL_PW_DOMAINS (icl_pwdoms_aux_tbt4,POWER_DOMAIN_AUX_TBT_F ); -static const struct i915_power_well_desc icl_power_wells[] = { +static const struct i915_power_well_desc icl_power_wells_pw_1[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, {/* Handled by the DMC firmware */ .instances = &I915_PW_INSTANCES( I915_PW("PW_1", I915_PW_DOMAINS_NONE,
@@ -699,7 +684,11 @@ static const struct i915_power_well_desc icl_power_wells[] = { .ops = &hsw_power_well_ops, .always_on = true, .has_fuses = true, - }, { + }, +}; + +static const struct i915_power_well_desc icl_power_wells_main[] = { + { .instances = &I915_PW_INSTANCES( I915_PW("DC_off", &icl_pwdoms_dc_off, .id = SKL_DISP_DC_OFF),
@@ -763,6 +752,12 @@ static const struct i915_power_well_desc icl_power_wells[] = { }, }; +static const struct i915_power_well_desc_list icl_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (icl_power_wells_pw_1), +I915_PW_DESCRIPTORS (icl_power_wells_main), +}; +#define TGL_PW_5_POWER_DOMAINS \ POWER_DOMAIN_PIPE_D, \ POWER_DOMAIN_PIPE_PANEL_FITTER_D, \
@@ -868,24 +863,8 @@ I915_DECL_PW_DOMAINS(tgl_pwdoms_tc_cold_off, POWER_DOMAIN_AUX_TBT6, POWER_DOMAIN_TC_COLD_OFF); -static const struct i915_power_well_desc tgl_power_wells[] = { +static const struct i915_power_well_desc tgl_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { -/* Handled by the DMC firmware */ - .instances = &I915_PW_INSTANCES ( -I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , - .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .id = SKL_DISP_PW_1), - ), - .ops = &hsw_power_well_ops, - .always_on = true, - .has_fuses = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("DC_off", &tgl_pwdoms_dc_off, .id = SKL_DISP_DC_OFF),
@@ -971,6 +950,12 @@ static const struct i915_power_well_desc tgl_power_wells[] = { }, }; +static const struct i915_power_well_desc_list tgl_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (icl_power_wells_pw_1), +I915_PW_DESCRIPTORS (tgl_power_wells_main), +}; +#define RKL_PW_4_POWER_DOMAINS \ POWER_DOMAIN_PIPE_C, \ POWER_DOMAIN_PIPE_PANEL_FITTER_C, \
@@ -1025,24 +1010,8 @@ I915_DECL_PW_DOMAINS(rkl_pwdoms_dc_off, POWER_DOMAIN_MODESET, POWER_DOMAIN_INIT); -static const struct i915_power_well_desc rkl_power_wells[] = { +static const struct i915_power_well_desc rkl_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { -/* Handled by the DMC firmware */ - .instances = &I915_PW_INSTANCES ( -I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , - .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .id = SKL_DISP_PW_1), - ), - .ops = &hsw_power_well_ops, - .always_on = true, - .has_fuses = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("DC_off", &rkl_pwdoms_dc_off, .id = SKL_DISP_DC_OFF),
@@ -1085,6 +1054,12 @@ static const struct i915_power_well_desc rkl_power_wells[] = { }, }; +static const struct i915_power_well_desc_list rkl_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (icl_power_wells_pw_1), +I915_PW_DESCRIPTORS (rkl_power_wells_main), +}; +/* * DG1 onwards Audio MMIO/VERBS lies in PG0 power well. */
@@ -1117,24 +1092,8 @@ I915_DECL_PW_DOMAINS(dg1_pwdoms_pw_2, POWER_DOMAIN_TRANSCODER_VDSC_PW2, POWER_DOMAIN_INIT); -static const struct i915_power_well_desc dg1_power_wells[] = { +static const struct i915_power_well_desc dg1_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { -/* Handled by the DMC firmware */ - .instances = &I915_PW_INSTANCES ( -I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , - .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .id = SKL_DISP_PW_1), - ), - .ops = &hsw_power_well_ops, - .always_on = true, - .has_fuses = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("DC_off", &dg1_pwdoms_dc_off, .id = SKL_DISP_DC_OFF),
@@ -1193,6 +1152,12 @@ static const struct i915_power_well_desc dg1_power_wells[] = { }, }; +static const struct i915_power_well_desc_list dg1_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (icl_power_wells_pw_1), +I915_PW_DESCRIPTORS (dg1_power_wells_main), +}; +/* * XE_LPD Power Domains *
@@ -1318,24 +1283,8 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_ddi_io_tc2, POWER_DOMAIN_PORT_DDI_IO_TC2);I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_tc3,POWER_DOMAIN_PORT_DDI_IO_TC3 );I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_tc4,POWER_DOMAIN_PORT_DDI_IO_TC4 ); -static const struct i915_power_well_desc xelpd_power_wells[] = { +static const struct i915_power_well_desc xelpd_power_wells_main[] = { { - .instances = &I915_PW_INSTANCES ( - I915_PW("always-on", &i9xx_pwdoms_always_on), - ), - .ops = &i9xx_always_on_power_well_ops, - .always_on = true, - }, { -/* Handled by the DMC firmware */ - .instances = &I915_PW_INSTANCES ( -I915_PW ("PW_1" ,I915_PW_DOMAINS_NONE , - .hsw.idx = ICL_PW_CTL_IDX_PW_1, - .id = SKL_DISP_PW_1), - ), - .ops = &hsw_power_well_ops, - .always_on = true, - .has_fuses = true, - }, { .instances = &I915_PW_INSTANCES( I915_PW("DC_off", &xelpd_pwdoms_dc_off, .id = SKL_DISP_DC_OFF),
@@ -1421,6 +1370,12 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { }, }; +static const struct i915_power_well_desc_list xelpd_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (icl_power_wells_pw_1), +I915_PW_DESCRIPTORS (xelpd_power_wells_main), +}; +static void init_power_well_domains (const struct i915_power_well_instance *inst,struct i915_power_well *power_well) {
@@ -1439,27 +1394,35 @@ static void init_power_well_domains(const struct i915_power_well_instance *inst,set_bit (inst->domain_list->list[j], power_well->domains.bits); } -#define for_each_power_well_instance (_desc_list, _desc_count, _desc, _inst) \ +#define for_each_power_well_instance_in_desc_list (_desc_list, _desc_count, _desc, _inst) \ for ((_desc) = (_desc_list); (_desc) - (_desc_list) < (_desc_count); (_desc)++) \ for ((_inst) = (_desc)->instances->list; \ (_inst) - (_desc)->instances->list < (_desc)->instances->count; \ (_inst)++) +#define for_each_power_well_instance (_desc_list, _desc_count, _descs, _desc, _inst) \ + for ((_descs) = (_desc_list); \ + (_descs) - (_desc_list) < (_desc_count); \ + (_descs)++) \ + for_each_power_well_instance_in_desc_list((_descs)->list, (_descs)->count, \ + (_desc), (_inst)) +static int __set_power_wells (struct i915_power_domains *power_domains, -const struct i915_power_well_desc *power_well_descs, +const struct i915_power_well_desc_list *power_well_descs,int power_well_descs_sz,u64 skip_mask) {struct drm_i915_private *i915 =container_of (power_domains, struct drm_i915_private, power_domains);u64 power_well_ids =0 ; +const struct i915_power_well_desc_list *desc_list;const struct i915_power_well_desc *desc;const struct i915_power_well_instance *inst;int power_well_count =0 ;int plt_idx =0 ; -for_each_power_well_instance (power_well_descs, power_well_descs_sz, desc, inst) +for_each_power_well_instance (power_well_descs, power_well_descs_sz, desc_list, desc, inst)if (!(BIT_ULL (inst->id) & skip_mask)) power_well_count++;
@@ -1471,7 +1434,7 @@ __set_power_wells(struct i915_power_domains *power_domains,if (!power_domains->power_wells)return -ENOMEM ; -for_each_power_well_instance (power_well_descs, power_well_descs_sz, desc, inst) { +for_each_power_well_instance (power_well_descs, power_well_descs_sz, desc_list, desc, inst) {struct i915_power_well *pw = &power_domains->power_wells[plt_idx];enum i915_power_well_id id = inst->id;
@@ -1557,7 +1520,7 @@ int intel_display_power_map_init(struct i915_power_domains *power_domains)else if (IS_I830 (i915))return set_power_wells (power_domains, i830_power_wells);else -return set_power_wells (power_domains, i9xx_always_on_power_well); +return set_power_wells (power_domains, i9xx_power_wells); }/**
Signature · 1 line
2.30.2
PATCH v3 12/18 drm/i915: Simplify the DG1 power well descriptors
In reply to Imre DeakSimplify the definition of DG1 power wells by reusing the identical RKL DDI/AUX descriptors.
This reorders the DG1 DDI/AUX vs. PW4/5 power wells, but this shouldn't make a difference (it is the order on RKL and the DDI/AUX power wells don't have a dependency on PW4/5).
--- .../i915/display/intel_display_power_map.c | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +7 -17
@@ -1035,7 +1035,11 @@ static const struct i915_power_well_desc rkl_power_wells_main[] = { .ops = &hsw_power_well_ops, .has_fuses = true, .irq_pipe_mask = BIT(PIPE_C), - }, { + }, +}; + +static const struct i915_power_well_desc rkl_power_wells_ddi_aux[] = { + { .instances = &I915_PW_INSTANCES( I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B),
@@ -1058,6 +1062,7 @@ static const struct i915_power_well_desc_list rkl_power_wells[] = {I915_PW_DESCRIPTORS (i9xx_power_wells_always_on),I915_PW_DESCRIPTORS (icl_power_wells_pw_1),I915_PW_DESCRIPTORS (rkl_power_wells_main), + I915_PW_DESCRIPTORS(rkl_power_wells_ddi_aux), };/*
@@ -1117,22 +1122,6 @@ static const struct i915_power_well_desc dg1_power_wells_main[] = { .irq_pipe_mask = BIT(PIPE_B), .has_vga = true, .has_fuses = true, - }, { - .instances = &I915_PW_INSTANCES( - I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), - I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), - I915_PW("DDI_IO_TC1", &tgl_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), - I915_PW("DDI_IO_TC2", &tgl_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), - ), - .ops = &icl_ddi_power_well_ops, - }, { - .instances = &I915_PW_INSTANCES ( - I915_PW("AUX_A", &tgl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), - I915_PW("AUX_B", &tgl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), - I915_PW("AUX_USBC1", &tgl_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), - I915_PW("AUX_USBC2", &tgl_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), - ), - .ops = &icl_aux_power_well_ops, }, { .instances = &I915_PW_INSTANCES( I915_PW("PW_4", &tgl_pwdoms_pw_4,
@@ -1156,6 +1145,7 @@ static const struct i915_power_well_desc_list dg1_power_wells[] = {I915_PW_DESCRIPTORS (i9xx_power_wells_always_on),I915_PW_DESCRIPTORS (icl_power_wells_pw_1),I915_PW_DESCRIPTORS (dg1_power_wells_main), + I915_PW_DESCRIPTORS(rkl_power_wells_ddi_aux), };/*
Signature · 1 line
2.30.2
PATCH v3 13/18 drm/i915: Sanitize the ADL-S power well definition
In reply to Imre DeakInstead of the skip_mask special casing of the ADL-S power well descriptors, add a power well descriptor list for ADL-S as well reusing the TGL descriptors, w/o the TC-cold power well. ADL-S doesn't have TypeC PHYs, so a better way would be having ADL-S specific AUX descriptors, but I left changing this for a follow-up.
This changes the ordering of the AUX and TC-cold vs. PW_4/5 power wells on TGL and ADL-S, but this shouldn't make a difference (PW_4/5 don't depend on the AUX/TC-cold power wells).
--- .../i915/display/intel_display_power_map.c | 69 +++++++++++-------- 1 file changed, 39 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +39 -30
@@ -902,12 +902,36 @@ static const struct i915_power_well_desc tgl_power_wells_main[] = { ), .ops = &icl_ddi_power_well_ops, }, { + .instances = &I915_PW_INSTANCES( + I915_PW("PW_4", &tgl_pwdoms_pw_4, + .hsw.idx = ICL_PW_CTL_IDX_PW_4), + ), + .ops = &hsw_power_well_ops, + .has_fuses = true, + .irq_pipe_mask = BIT(PIPE_C), + }, { + .instances = &I915_PW_INSTANCES( + I915_PW("PW_5", &tgl_pwdoms_pw_5, + .hsw.idx = TGL_PW_CTL_IDX_PW_5), + ), + .ops = &hsw_power_well_ops, + .has_fuses = true, + .irq_pipe_mask = BIT(PIPE_D), + }, +}; + +static const struct i915_power_well_desc tgl_power_wells_tc_cold_off[] = { + { .instances = &I915_PW_INSTANCES( I915_PW("TC_cold_off", &tgl_pwdoms_tc_cold_off, .id = TGL_DISP_PW_TC_COLD_OFF), ), .ops = &tgl_tc_cold_off_ops, - }, { + }, +}; + +static const struct i915_power_well_desc tgl_power_wells_aux[] = { + { .instances = &I915_PW_INSTANCES( I915_PW("AUX_A", &tgl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), I915_PW("AUX_B", &tgl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B),
@@ -931,22 +955,6 @@ static const struct i915_power_well_desc tgl_power_wells_main[] = { ), .ops = &icl_aux_power_well_ops, .is_tc_tbt = true, - }, { - .instances = &I915_PW_INSTANCES( -I915_PW ("PW_4" , &tgl_pwdoms_pw_4, - .hsw.idx = ICL_PW_CTL_IDX_PW_4), - ), - .ops = &hsw_power_well_ops, - .has_fuses = true, - .irq_pipe_mask = BIT(PIPE_C), - }, { - .instances = &I915_PW_INSTANCES ( -I915_PW ("PW_5" , &tgl_pwdoms_pw_5, - .hsw.idx = TGL_PW_CTL_IDX_PW_5), - ), - .ops = &hsw_power_well_ops, - .has_fuses = true, - .irq_pipe_mask = BIT(PIPE_D), }, };
@@ -954,6 +962,15 @@ static const struct i915_power_well_desc_list tgl_power_wells[] = {I915_PW_DESCRIPTORS (i9xx_power_wells_always_on),I915_PW_DESCRIPTORS (icl_power_wells_pw_1),I915_PW_DESCRIPTORS (tgl_power_wells_main), +I915_PW_DESCRIPTORS (tgl_power_wells_tc_cold_off), + I915_PW_DESCRIPTORS(tgl_power_wells_aux), +}; + +static const struct i915_power_well_desc_list adls_power_wells[] = { +I915_PW_DESCRIPTORS (i9xx_power_wells_always_on), +I915_PW_DESCRIPTORS (icl_power_wells_pw_1), +I915_PW_DESCRIPTORS (tgl_power_wells_main), +I915_PW_DESCRIPTORS (tgl_power_wells_aux), };#define RKL_PW_4_POWER_DOMAINS \
@@ -1400,7 +1417,7 @@ static void init_power_well_domains(const struct i915_power_well_instance *inst,static int __set_power_wells (struct i915_power_domains *power_domains,const struct i915_power_well_desc_list *power_well_descs, -int power_well_descs_sz,u64 skip_mask) +int power_well_descs_sz) { struct drm_i915_private *i915 = container_of(power_domains, struct drm_i915_private,
@@ -1413,8 +1430,7 @@ __set_power_wells(struct i915_power_domains *power_domains,int plt_idx =0 ;for_each_power_well_instance (power_well_descs, power_well_descs_sz, desc_list, desc, inst) -if (!(BIT_ULL (inst->id) & skip_mask)) - power_well_count++; + power_well_count++; power_domains->power_well_count = power_well_count; power_domains->power_wells =
@@ -1428,9 +1444,6 @@ __set_power_wells(struct i915_power_domains *power_domains,struct i915_power_well *pw = &power_domains->power_wells[plt_idx];enum i915_power_well_id id = inst->id; -if (BIT_ULL (id) & skip_mask) -continue ; - pw->desc = desc;drm_WARN_ON (&i915->drm,overflows_type (inst - desc->instances->list, pw->instance_idx));
@@ -1451,12 +1464,9 @@ __set_power_wells(struct i915_power_domains *power_domains,return 0 ; } -#define set_power_wells_mask (power_domains, __power_well_descs, skip_mask) \ - __set_power_wells(power_domains, __power_well_descs, \ - ARRAY_SIZE(__power_well_descs), skip_mask) -#define set_power_wells (power_domains, __power_well_descs) \ - set_power_wells_mask(power_domains, __power_well_descs, 0) + __set_power_wells(power_domains, __power_well_descs, \ + ARRAY_SIZE(__power_well_descs))/** * intel_display_power_map_init - initialize power domain -> power well mappings
@@ -1485,8 +1495,7 @@ int intel_display_power_map_init(struct i915_power_domains *power_domains)else if (IS_DG1 (i915))return set_power_wells (power_domains, dg1_power_wells);else if (IS_ALDERLAKE_S (i915)) -return set_power_wells_mask (power_domains, tgl_power_wells, -BIT_ULL (TGL_DISP_PW_TC_COLD_OFF )); +return set_power_wells (power_domains, adls_power_wells);else if (IS_ROCKETLAKE (i915))return set_power_wells (power_domains, rkl_power_wells);else if (DISPLAY_VER (i915) ==12 )
Signature · 1 line
2.30.2
PATCH v3 14/18 drm/i915: Sanitize the port -> DDI/AUX power domain mapping for each platform
In reply to Imre DeakAtm the port -> DDI and AUX power domain mapping is specified by relying on the aliasing of the platform specific intel_display_power_domain enum values. For instance D12+ platforms refer to the 'D' port and power domain instances, which doesn't match the bspec terminology, on these platforms the corresponding port is TC1. To make it clear what port/domain the code refers to add a mapping between them which matches the bspec terms on different display versions.
This also allows for removing the aliasing in enum values in a follow-up patch.
v2: Add the functions to intel_display_power.c, use
intel_display_power_ prefix.
--- drivers/gpu/drm/i915/display/g4x_dp.c | 3 +- drivers/gpu/drm/i915/display/g4x_hdmi.c | 3 +- drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- drivers/gpu/drm/i915/display/intel_display.c | 85 +------- drivers/gpu/drm/i915/display/intel_display.h | 4 +- .../drm/i915/display/intel_display_power.c | 206 ++++++++++++++++++ .../drm/i915/display/intel_display_power.h | 12 + drivers/gpu/drm/i915/display/intel_tc.c | 5 +- 8 files changed, 235 insertions(+), 89 deletions(-)
drivers/gpu/drm/i915/display/g4x_dp.c +2 -1
@@ -13,6 +13,7 @@#include "intel_connector.h" #include "intel_crtc.h" #include "intel_de.h" +#include "intel_display_power.h" #include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_link_training.h"
@@ -1383,7 +1384,7 @@ bool g4x_dp_init(struct drm_i915_private *dev_priv, dig_port->max_lanes =4 ; intel_encoder->type =INTEL_OUTPUT_DP ; - intel_encoder->power_domain =intel_port_to_power_domain (port); + intel_encoder->power_domain =intel_display_power_ddi_lanes_domain (dev_priv, port);if (IS_CHERRYVIEW (dev_priv)) {if (port ==PORT_D ) intel_encoder->pipe_mask =BIT (PIPE_C );
drivers/gpu/drm/i915/display/g4x_hdmi.c +2 -1
@@ -10,6 +10,7 @@#include "intel_connector.h" #include "intel_crtc.h" #include "intel_de.h" +#include "intel_display_power.h" #include "intel_display_types.h" #include "intel_dpio_phy.h" #include "intel_fifo_underrun.h"
@@ -588,7 +589,7 @@ void g4x_hdmi_init(struct drm_i915_private *dev_priv, intel_encoder->shutdown = intel_hdmi_encoder_shutdown; intel_encoder->type =INTEL_OUTPUT_HDMI ; - intel_encoder->power_domain =intel_port_to_power_domain (port); + intel_encoder->power_domain =intel_display_power_ddi_lanes_domain (dev_priv, port); intel_encoder->port = port;if (IS_CHERRYVIEW (dev_priv)) {if (port ==PORT_D )
drivers/gpu/drm/i915/display/intel_ddi.c +3 -3
@@ -40,6 +40,7 @@#include "intel_ddi.h" #include "intel_ddi_buf_trans.h" #include "intel_de.h" +#include "intel_display_power.h" #include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_link_training.h"
@@ -4371,7 +4372,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->get_power_domains = intel_ddi_get_power_domains; encoder->type =INTEL_OUTPUT_DDI ; - encoder->power_domain =intel_port_to_power_domain (port); + encoder->power_domain =intel_display_power_ddi_lanes_domain (dev_priv, port); encoder->port = port; encoder->cloneable =0 ; encoder->pipe_mask = ~0 ;
@@ -4499,8 +4500,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) }drm_WARN_ON (&dev_priv->drm, port >PORT_I ); - dig_port->ddi_io_power_domain =POWER_DOMAIN_PORT_DDI_IO_A + - port -PORT_A ; + dig_port->ddi_io_power_domain =intel_display_power_ddi_io_domain (dev_priv, port);if (init_dp) {if (!intel_ddi_init_dp_connector (dig_port))
drivers/gpu/drm/i915/display/intel_display.c +5 -80
102 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display.h +1 -3
@@ -635,11 +635,9 @@ void intel_cpu_transcoder_get_m2_n2(struct intel_crtc *crtc,void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config);int intel_dotclock_calculate (int link_freq,const struct intel_link_m_n *m_n); -enum intel_display_power_domain intel_port_to_power_domain (enum port port); +enum intel_display_power_domain intel_port_to_power_domain (struct intel_digital_port *dig_port);enum intel_display_power_domain intel_aux_power_domain (struct intel_digital_port *dig_port); -enum intel_display_power_domain -intel_legacy_aux_to_power_domain (enum aux_ch aux_ch);void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state);void ilk_pfit_disable (const struct intel_crtc_state *old_crtc_state);
drivers/gpu/drm/i915/display/intel_display_power.c +206 -0
209 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power.h +12 -0
@@ -8,8 +8,10 @@#include "intel_runtime_pm.h" +enum aux_ch ;enum dpio_channel ;enum dpio_phy ; +enum port ;struct drm_i915_private ;struct i915_power_well ;struct intel_encoder ;
@@ -130,6 +132,7 @@ enum intel_display_power_domain {POWER_DOMAIN_INIT ,POWER_DOMAIN_NUM , + POWER_DOMAIN_INVALID = POWER_DOMAIN_NUM, };#define POWER_DOMAIN_PIPE (pipe) ((pipe) + POWER_DOMAIN_PIPE_A)
@@ -266,6 +269,15 @@ intel_display_power_put_all_in_set(struct drm_i915_private *i915,void intel_display_power_debug (struct drm_i915_private *i915,struct seq_file *m); +enum intel_display_power_domain +intel_display_power_ddi_lanes_domain (struct drm_i915_private *i915,enum port port); +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_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); +/* * FIXME: We should probably switch this to a 0-based scheme to be consistent * with how we now name/number DBUF_CTL instances.
drivers/gpu/drm/i915/display/intel_tc.c +4 -1
@@ -6,6 +6,7 @@#include "i915_drv.h" #include "i915_reg.h" #include "intel_display.h" +#include "intel_display_power_map.h" #include "intel_display_types.h" #include "intel_dp_mst.h" #include "intel_tc.h"
@@ -61,10 +62,12 @@ bool intel_tc_cold_requires_aux_pw(struct intel_digital_port *dig_port)static enum intel_display_power_domain tc_cold_get_power_domain (struct intel_digital_port *dig_port,enum tc_port_mode mode) { +struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +if (mode ==TC_PORT_TBT_ALT || !intel_tc_cold_requires_aux_pw (dig_port))return POWER_DOMAIN_TC_COLD_OFF ; -return intel_legacy_aux_to_power_domain (dig_port->aux_ch); +return intel_display_power_legacy_aux_domain (i915, dig_port->aux_ch); } static intel_wakeref_t
Signature · 1 line
2.30.2
PATCH v3 15/18 drm/i915: Remove the aliasing of power domain enum values
In reply to Imre DeakAliasing the intel_display_power_domain enum values was required because of the u64 power domain mask size limit. This makes the dmesg/debugfs printouts of the domain names somewhat unclear, for instance domain names for port D are shown on D12+ platforms where the corresponding port is called TC1. Make this clearer by removing the aliasing which is possible after a previous patch converting the mask to a bitmap.
--- .../drm/i915/display/intel_display_power.c | 84 +++++++++++++------ .../drm/i915/display/intel_display_power.h | 26 ++---- 2 files changed, 67 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +60 -24
@@ -80,12 +80,22 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "PORT_DDI_LANES_E" ;case POWER_DOMAIN_PORT_DDI_LANES_F :return "PORT_DDI_LANES_F" ; -case POWER_DOMAIN_PORT_DDI_LANES_G : -return "PORT_DDI_LANES_G" ; -case POWER_DOMAIN_PORT_DDI_LANES_H : -return "PORT_DDI_LANES_H" ; -case POWER_DOMAIN_PORT_DDI_LANES_I : -return "PORT_DDI_LANES_I" ; +case POWER_DOMAIN_PORT_DDI_LANES_TC1 : +return "PORT_DDI_LANES_TC1" ; +case POWER_DOMAIN_PORT_DDI_LANES_TC2 : +return "PORT_DDI_LANES_TC2" ; +case POWER_DOMAIN_PORT_DDI_LANES_TC3 : +return "PORT_DDI_LANES_TC3" ; +case POWER_DOMAIN_PORT_DDI_LANES_TC4 : +return "PORT_DDI_LANES_TC4" ; +case POWER_DOMAIN_PORT_DDI_LANES_TC5 : +return "PORT_DDI_LANES_TC5" ; +case POWER_DOMAIN_PORT_DDI_LANES_TC6 : +return "PORT_DDI_LANES_TC6" ; +case POWER_DOMAIN_PORT_DDI_LANES_D_XELPD : +return "PORT_DDI_LANES_D_XELPD" ; +case POWER_DOMAIN_PORT_DDI_LANES_E_XELPD : +return "PORT_DDI_LANES_E_XELPD" ;case POWER_DOMAIN_PORT_DDI_IO_A :return "PORT_DDI_IO_A" ;case POWER_DOMAIN_PORT_DDI_IO_B :
@@ -98,12 +108,22 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "PORT_DDI_IO_E" ;case POWER_DOMAIN_PORT_DDI_IO_F :return "PORT_DDI_IO_F" ; -case POWER_DOMAIN_PORT_DDI_IO_G : -return "PORT_DDI_IO_G" ; -case POWER_DOMAIN_PORT_DDI_IO_H : -return "PORT_DDI_IO_H" ; -case POWER_DOMAIN_PORT_DDI_IO_I : -return "PORT_DDI_IO_I" ; +case POWER_DOMAIN_PORT_DDI_IO_TC1 : +return "PORT_DDI_IO_TC1" ; +case POWER_DOMAIN_PORT_DDI_IO_TC2 : +return "PORT_DDI_IO_TC2" ; +case POWER_DOMAIN_PORT_DDI_IO_TC3 : +return "PORT_DDI_IO_TC3" ; +case POWER_DOMAIN_PORT_DDI_IO_TC4 : +return "PORT_DDI_IO_TC4" ; +case POWER_DOMAIN_PORT_DDI_IO_TC5 : +return "PORT_DDI_IO_TC5" ; +case POWER_DOMAIN_PORT_DDI_IO_TC6 : +return "PORT_DDI_IO_TC6" ; +case POWER_DOMAIN_PORT_DDI_IO_D_XELPD : +return "PORT_DDI_IO_D_XELPD" ; +case POWER_DOMAIN_PORT_DDI_IO_E_XELPD : +return "PORT_DDI_IO_E_XELPD" ;case POWER_DOMAIN_PORT_DSI :return "PORT_DSI" ;case POWER_DOMAIN_PORT_CRT :
@@ -128,12 +148,22 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "AUX_E" ;case POWER_DOMAIN_AUX_F :return "AUX_F" ; -case POWER_DOMAIN_AUX_G : -return "AUX_G" ; -case POWER_DOMAIN_AUX_H : -return "AUX_H" ; -case POWER_DOMAIN_AUX_I : -return "AUX_I" ; +case POWER_DOMAIN_AUX_USBC1 : +return "AUX_USBC1" ; +case POWER_DOMAIN_AUX_USBC2 : +return "AUX_USBC2" ; +case POWER_DOMAIN_AUX_USBC3 : +return "AUX_USBC3" ; +case POWER_DOMAIN_AUX_USBC4 : +return "AUX_USBC4" ; +case POWER_DOMAIN_AUX_USBC5 : +return "AUX_USBC5" ; +case POWER_DOMAIN_AUX_USBC6 : +return "AUX_USBC6" ; +case POWER_DOMAIN_AUX_D_XELPD : +return "AUX_D_XELPD" ; +case POWER_DOMAIN_AUX_E_XELPD : +return "AUX_E_XELPD" ;case POWER_DOMAIN_AUX_IO_A :return "AUX_IO_A" ;case POWER_DOMAIN_AUX_TBT_C :
@@ -144,12 +174,18 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "AUX_TBT_E" ;case POWER_DOMAIN_AUX_TBT_F :return "AUX_TBT_F" ; -case POWER_DOMAIN_AUX_TBT_G : -return "AUX_TBT_G" ; -case POWER_DOMAIN_AUX_TBT_H : -return "AUX_TBT_H" ; -case POWER_DOMAIN_AUX_TBT_I : -return "AUX_TBT_I" ; +case POWER_DOMAIN_AUX_TBT1 : +return "AUX_TBT1" ; +case POWER_DOMAIN_AUX_TBT2 : +return "AUX_TBT2" ; +case POWER_DOMAIN_AUX_TBT3 : +return "AUX_TBT3" ; +case POWER_DOMAIN_AUX_TBT4 : +return "AUX_TBT4" ; +case POWER_DOMAIN_AUX_TBT5 : +return "AUX_TBT5" ; +case POWER_DOMAIN_AUX_TBT6 : +return "AUX_TBT6" ;case POWER_DOMAIN_GMBUS :return "GMBUS" ;case POWER_DOMAIN_INIT :
drivers/gpu/drm/i915/display/intel_display_power.h +7 -19
@@ -48,18 +48,15 @@ enum intel_display_power_domain {POWER_DOMAIN_PORT_DDI_LANES_D ,POWER_DOMAIN_PORT_DDI_LANES_E ,POWER_DOMAIN_PORT_DDI_LANES_F , -POWER_DOMAIN_PORT_DDI_LANES_G , -POWER_DOMAIN_PORT_DDI_LANES_H , -POWER_DOMAIN_PORT_DDI_LANES_I , -POWER_DOMAIN_PORT_DDI_LANES_TC1 =POWER_DOMAIN_PORT_DDI_LANES_D ,/* tgl+ */ +POWER_DOMAIN_PORT_DDI_LANES_TC1 ,POWER_DOMAIN_PORT_DDI_LANES_TC2 ,POWER_DOMAIN_PORT_DDI_LANES_TC3 ,POWER_DOMAIN_PORT_DDI_LANES_TC4 ,POWER_DOMAIN_PORT_DDI_LANES_TC5 ,POWER_DOMAIN_PORT_DDI_LANES_TC6 , -POWER_DOMAIN_PORT_DDI_LANES_D_XELPD =POWER_DOMAIN_PORT_DDI_LANES_TC5 ,/* XELPD */ +POWER_DOMAIN_PORT_DDI_LANES_D_XELPD ,POWER_DOMAIN_PORT_DDI_LANES_E_XELPD , POWER_DOMAIN_PORT_DDI_IO_A,
@@ -68,18 +65,15 @@ enum intel_display_power_domain {POWER_DOMAIN_PORT_DDI_IO_D ,POWER_DOMAIN_PORT_DDI_IO_E ,POWER_DOMAIN_PORT_DDI_IO_F , -POWER_DOMAIN_PORT_DDI_IO_G , -POWER_DOMAIN_PORT_DDI_IO_H , -POWER_DOMAIN_PORT_DDI_IO_I , -POWER_DOMAIN_PORT_DDI_IO_TC1 =POWER_DOMAIN_PORT_DDI_IO_D ,/* tgl+ */ +POWER_DOMAIN_PORT_DDI_IO_TC1 ,POWER_DOMAIN_PORT_DDI_IO_TC2 ,POWER_DOMAIN_PORT_DDI_IO_TC3 ,POWER_DOMAIN_PORT_DDI_IO_TC4 ,POWER_DOMAIN_PORT_DDI_IO_TC5 ,POWER_DOMAIN_PORT_DDI_IO_TC6 , -POWER_DOMAIN_PORT_DDI_IO_D_XELPD =POWER_DOMAIN_PORT_DDI_IO_TC5 ,/* XELPD */ +POWER_DOMAIN_PORT_DDI_IO_D_XELPD ,POWER_DOMAIN_PORT_DDI_IO_E_XELPD , POWER_DOMAIN_PORT_DSI,
@@ -94,18 +88,15 @@ enum intel_display_power_domain {POWER_DOMAIN_AUX_D ,POWER_DOMAIN_AUX_E ,POWER_DOMAIN_AUX_F , -POWER_DOMAIN_AUX_G , -POWER_DOMAIN_AUX_H , -POWER_DOMAIN_AUX_I , -POWER_DOMAIN_AUX_USBC1 =POWER_DOMAIN_AUX_D ,/* tgl+ */ +POWER_DOMAIN_AUX_USBC1 ,POWER_DOMAIN_AUX_USBC2 ,POWER_DOMAIN_AUX_USBC3 ,POWER_DOMAIN_AUX_USBC4 ,POWER_DOMAIN_AUX_USBC5 ,POWER_DOMAIN_AUX_USBC6 , -POWER_DOMAIN_AUX_D_XELPD =POWER_DOMAIN_AUX_USBC5 ,/* XELPD */ +POWER_DOMAIN_AUX_D_XELPD ,POWER_DOMAIN_AUX_E_XELPD , POWER_DOMAIN_AUX_IO_A,
@@ -113,11 +104,8 @@ enum intel_display_power_domain {POWER_DOMAIN_AUX_TBT_D ,POWER_DOMAIN_AUX_TBT_E ,POWER_DOMAIN_AUX_TBT_F , -POWER_DOMAIN_AUX_TBT_G , -POWER_DOMAIN_AUX_TBT_H , -POWER_DOMAIN_AUX_TBT_I , -POWER_DOMAIN_AUX_TBT1 =POWER_DOMAIN_AUX_TBT_D ,/* tgl+ */ +POWER_DOMAIN_AUX_TBT1 ,POWER_DOMAIN_AUX_TBT2 ,POWER_DOMAIN_AUX_TBT3 , POWER_DOMAIN_AUX_TBT4,
Signature · 1 line
2.30.2
PATCH v3 16/18 drm/i915: Remove the ICL specific TBT power domains
In reply to Imre DeakThe spec calls the ICL TBT AUX power well instances TBT1-4 (similarly to all later platforms), align the power domain names with the spec.
--- .../gpu/drm/i915/display/intel_display_power.c | 10 +--------- .../gpu/drm/i915/display/intel_display_power.h | 4 ---- .../drm/i915/display/intel_display_power_map.c | 16 ++++++++-------- 3 files changed, 9 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +1 -9
@@ -166,14 +166,6 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "AUX_E_XELPD" ;case POWER_DOMAIN_AUX_IO_A :return "AUX_IO_A" ; -case POWER_DOMAIN_AUX_TBT_C : -return "AUX_TBT_C" ; -case POWER_DOMAIN_AUX_TBT_D : -return "AUX_TBT_D" ; -case POWER_DOMAIN_AUX_TBT_E : -return "AUX_TBT_E" ; -case POWER_DOMAIN_AUX_TBT_F : -return "AUX_TBT_F" ;case POWER_DOMAIN_AUX_TBT1 :return "AUX_TBT1" ;case POWER_DOMAIN_AUX_TBT2 :
@@ -2341,7 +2333,7 @@ d11_port_domains[] = { .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_C, .ddi_io = POWER_DOMAIN_PORT_DDI_IO_C, .aux_legacy_usbc = POWER_DOMAIN_AUX_C, - .aux_tbt = POWER_DOMAIN_AUX_TBT_C, + .aux_tbt = POWER_DOMAIN_AUX_TBT1, }, };
drivers/gpu/drm/i915/display/intel_display_power.h +0 -4
@@ -100,10 +100,6 @@ enum intel_display_power_domain {POWER_DOMAIN_AUX_E_XELPD ,POWER_DOMAIN_AUX_IO_A , -POWER_DOMAIN_AUX_TBT_C , -POWER_DOMAIN_AUX_TBT_D , -POWER_DOMAIN_AUX_TBT_E , -POWER_DOMAIN_AUX_TBT_F ,POWER_DOMAIN_AUX_TBT1 , POWER_DOMAIN_AUX_TBT2,
drivers/gpu/drm/i915/display/intel_display_power_map.c +8 -8
@@ -622,10 +622,10 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_pw_4,POWER_DOMAIN_AUX_D , \POWER_DOMAIN_AUX_E , \POWER_DOMAIN_AUX_F , \ -POWER_DOMAIN_AUX_TBT_C , \ -POWER_DOMAIN_AUX_TBT_D , \ -POWER_DOMAIN_AUX_TBT_E , \ - POWER_DOMAIN_AUX_TBT_F +POWER_DOMAIN_AUX_TBT1 , \ +POWER_DOMAIN_AUX_TBT2 , \ +POWER_DOMAIN_AUX_TBT3 , \ + POWER_DOMAIN_AUX_TBT4 I915_DECL_PW_DOMAINS(icl_pwdoms_pw_3, ICL_PW_3_POWER_DOMAINS,
@@ -668,10 +668,10 @@ 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_tbt1,POWER_DOMAIN_AUX_TBT_C ); -I915_DECL_PW_DOMAINS (icl_pwdoms_aux_tbt2,POWER_DOMAIN_AUX_TBT_D ); -I915_DECL_PW_DOMAINS (icl_pwdoms_aux_tbt3,POWER_DOMAIN_AUX_TBT_E ); -I915_DECL_PW_DOMAINS (icl_pwdoms_aux_tbt4,POWER_DOMAIN_AUX_TBT_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 ); +I915_DECL_PW_DOMAINS (icl_pwdoms_aux_tbt4,POWER_DOMAIN_AUX_TBT4 );static const struct i915_power_well_desc icl_power_wells_pw_1[] = { {
Signature · 1 line
2.30.2
PATCH v3 17/18 drm/i915: Remove duplicate DDI/AUX power domain mappings
In reply to Imre DeakThe DDI and AUX domain -> power well mappings are identical for a few platforms/power well instances, reuse the mappings of earlier platforms for these removing the duplicate mapping of new platforms.
--- .../i915/display/intel_display_power_map.c | 89 +++++++------------ 1 file changed, 31 insertions(+), 58 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power_map.c +31 -58
@@ -653,9 +653,6 @@ I915_DECL_PW_DOMAINS(icl_pwdoms_dc_off,POWER_DOMAIN_DC_OFF , POWER_DOMAIN_INIT); -I915_DECL_PW_DOMAINS (icl_pwdoms_ddi_io_a,POWER_DOMAIN_PORT_DDI_IO_A ); -I915_DECL_PW_DOMAINS (icl_pwdoms_ddi_io_b,POWER_DOMAIN_PORT_DDI_IO_B ); -I915_DECL_PW_DOMAINS (icl_pwdoms_ddi_io_c,POWER_DOMAIN_PORT_DDI_IO_C );I915_DECL_PW_DOMAINS (icl_pwdoms_ddi_io_d,POWER_DOMAIN_PORT_DDI_IO_D );I915_DECL_PW_DOMAINS (icl_pwdoms_ddi_io_e,POWER_DOMAIN_PORT_DDI_IO_E );I915_DECL_PW_DOMAINS (icl_pwdoms_ddi_io_f,POWER_DOMAIN_PORT_DDI_IO_F );
@@ -714,9 +711,9 @@ static const struct i915_power_well_desc icl_power_wells_main[] = { .has_fuses = true, }, { .instances = &I915_PW_INSTANCES( - I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), - I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), - I915_PW("DDI_IO_C", &icl_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), + I915_PW("DDI_IO_A", &glk_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &glk_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_C", &glk_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), I915_PW("DDI_IO_D", &icl_pwdoms_ddi_io_d, .hsw.idx = ICL_PW_CTL_IDX_DDI_D), I915_PW("DDI_IO_E", &icl_pwdoms_ddi_io_e, .hsw.idx = ICL_PW_CTL_IDX_DDI_E), I915_PW("DDI_IO_F", &icl_pwdoms_ddi_io_f, .hsw.idx = ICL_PW_CTL_IDX_DDI_F),
@@ -828,12 +825,6 @@ I915_DECL_PW_DOMAINS(tgl_pwdoms_ddi_io_tc4, POWER_DOMAIN_PORT_DDI_IO_TC4);I915_DECL_PW_DOMAINS (tgl_pwdoms_ddi_io_tc5,POWER_DOMAIN_PORT_DDI_IO_TC5 );I915_DECL_PW_DOMAINS (tgl_pwdoms_ddi_io_tc6,POWER_DOMAIN_PORT_DDI_IO_TC6 ); -I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_a, -POWER_DOMAIN_AUX_A , -POWER_DOMAIN_AUX_IO_A ); -I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_b,POWER_DOMAIN_AUX_B ); -I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_c,POWER_DOMAIN_AUX_C ); -I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_usbc1,POWER_DOMAIN_AUX_USBC1 );I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_usbc2,POWER_DOMAIN_AUX_USBC2 );I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_usbc3,POWER_DOMAIN_AUX_USBC3 );
@@ -841,10 +832,6 @@ I915_DECL_PW_DOMAINS(tgl_pwdoms_aux_usbc4, POWER_DOMAIN_AUX_USBC4);I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_usbc5,POWER_DOMAIN_AUX_USBC5 );I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_usbc6,POWER_DOMAIN_AUX_USBC6 ); -I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_tbt1,POWER_DOMAIN_AUX_TBT1 ); -I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_tbt2,POWER_DOMAIN_AUX_TBT2 ); -I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_tbt3,POWER_DOMAIN_AUX_TBT3 ); -I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_tbt4,POWER_DOMAIN_AUX_TBT4 );I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_tbt5,POWER_DOMAIN_AUX_TBT5 );I915_DECL_PW_DOMAINS (tgl_pwdoms_aux_tbt6,POWER_DOMAIN_AUX_TBT6 );
@@ -890,9 +877,9 @@ static const struct i915_power_well_desc tgl_power_wells_main[] = { .has_fuses = true, }, { .instances = &I915_PW_INSTANCES( - I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), - I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), - I915_PW("DDI_IO_C", &icl_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), + I915_PW("DDI_IO_A", &glk_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &glk_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_C", &glk_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), I915_PW("DDI_IO_TC1", &tgl_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), I915_PW("DDI_IO_TC2", &tgl_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), I915_PW("DDI_IO_TC3", &tgl_pwdoms_ddi_io_tc3, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC3),
@@ -933,9 +920,9 @@ static const struct i915_power_well_desc tgl_power_wells_tc_cold_off[] = {static const struct i915_power_well_desc tgl_power_wells_aux[] = { { .instances = &I915_PW_INSTANCES( - I915_PW("AUX_A", &tgl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), - I915_PW("AUX_B", &tgl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), - I915_PW("AUX_C", &tgl_pwdoms_aux_c, .hsw.idx = ICL_PW_CTL_IDX_AUX_C), + I915_PW("AUX_A", &icl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), + I915_PW("AUX_B", &icl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), + I915_PW("AUX_C", &icl_pwdoms_aux_c, .hsw.idx = ICL_PW_CTL_IDX_AUX_C), I915_PW("AUX_USBC1", &tgl_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), I915_PW("AUX_USBC2", &tgl_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), I915_PW("AUX_USBC3", &tgl_pwdoms_aux_usbc3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3),
@@ -946,10 +933,10 @@ static const struct i915_power_well_desc tgl_power_wells_aux[] = { .ops = &icl_aux_power_well_ops, }, { .instances = &I915_PW_INSTANCES( - I915_PW("AUX_TBT1", &tgl_pwdoms_aux_tbt1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1), - I915_PW("AUX_TBT2", &tgl_pwdoms_aux_tbt2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2), - I915_PW("AUX_TBT3", &tgl_pwdoms_aux_tbt3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3), - I915_PW("AUX_TBT4", &tgl_pwdoms_aux_tbt4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4), + I915_PW("AUX_TBT1", &icl_pwdoms_aux_tbt1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1), + I915_PW("AUX_TBT2", &icl_pwdoms_aux_tbt2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2), + I915_PW("AUX_TBT3", &icl_pwdoms_aux_tbt3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3), + I915_PW("AUX_TBT4", &icl_pwdoms_aux_tbt4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4), I915_PW("AUX_TBT5", &tgl_pwdoms_aux_tbt5, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT5), I915_PW("AUX_TBT6", &tgl_pwdoms_aux_tbt6, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT6), ),
@@ -1058,8 +1045,8 @@ static const struct i915_power_well_desc rkl_power_wells_main[] = {static const struct i915_power_well_desc rkl_power_wells_ddi_aux[] = { { .instances = &I915_PW_INSTANCES ( - I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), - I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_A", &glk_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &glk_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), I915_PW("DDI_IO_TC1", &tgl_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), I915_PW("DDI_IO_TC2", &tgl_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), ),
@@ -1273,22 +1260,8 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_dc_off,I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_d_xelpd,POWER_DOMAIN_AUX_D_XELPD );I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_e_xelpd,POWER_DOMAIN_AUX_E_XELPD ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_usbc1,POWER_DOMAIN_AUX_USBC1 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_usbc2,POWER_DOMAIN_AUX_USBC2 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_usbc3,POWER_DOMAIN_AUX_USBC3 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_usbc4,POWER_DOMAIN_AUX_USBC4 ); - -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_tbt1,POWER_DOMAIN_AUX_TBT1 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_tbt2,POWER_DOMAIN_AUX_TBT2 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_tbt3,POWER_DOMAIN_AUX_TBT3 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_tbt4,POWER_DOMAIN_AUX_TBT4 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_d_xelpd,POWER_DOMAIN_PORT_DDI_IO_D_XELPD );I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_e_xelpd,POWER_DOMAIN_PORT_DDI_IO_E_XELPD ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_tc1,POWER_DOMAIN_PORT_DDI_IO_TC1 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_tc2,POWER_DOMAIN_PORT_DDI_IO_TC2 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_tc3,POWER_DOMAIN_PORT_DDI_IO_TC3 ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_tc4,POWER_DOMAIN_PORT_DDI_IO_TC4 );static const struct i915_power_well_desc xelpd_power_wells_main[] = { {
@@ -1340,37 +1313,37 @@ static const struct i915_power_well_desc xelpd_power_wells_main[] = { .has_fuses = true, }, { .instances = &I915_PW_INSTANCES( - I915_PW("DDI_IO_A", &icl_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), - I915_PW("DDI_IO_B", &icl_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), - I915_PW("DDI_IO_C", &icl_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), + I915_PW("DDI_IO_A", &glk_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), + I915_PW("DDI_IO_B", &glk_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), + I915_PW("DDI_IO_C", &glk_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), I915_PW("DDI_IO_D_XELPD", &xelpd_pwdoms_ddi_io_d_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_DDI_D), I915_PW("DDI_IO_E_XELPD", &xelpd_pwdoms_ddi_io_e_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_DDI_E), - I915_PW("DDI_IO_TC1", &xelpd_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), - I915_PW("DDI_IO_TC2", &xelpd_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), - I915_PW("DDI_IO_TC3", &xelpd_pwdoms_ddi_io_tc3, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC3), - I915_PW("DDI_IO_TC4", &xelpd_pwdoms_ddi_io_tc4, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC4), + I915_PW("DDI_IO_TC1", &tgl_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), + I915_PW("DDI_IO_TC2", &tgl_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), + I915_PW("DDI_IO_TC3", &tgl_pwdoms_ddi_io_tc3, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC3), + I915_PW("DDI_IO_TC4", &tgl_pwdoms_ddi_io_tc4, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC4), ), .ops = &icl_ddi_power_well_ops, }, { .instances = &I915_PW_INSTANCES ( I915_PW("AUX_A", &icl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), I915_PW("AUX_B", &icl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), - I915_PW("AUX_C", &tgl_pwdoms_aux_c, .hsw.idx = ICL_PW_CTL_IDX_AUX_C), + I915_PW("AUX_C", &icl_pwdoms_aux_c, .hsw.idx = ICL_PW_CTL_IDX_AUX_C), I915_PW("AUX_D_XELPD", &xelpd_pwdoms_aux_d_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_AUX_D), I915_PW("AUX_E_XELPD", &xelpd_pwdoms_aux_e_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_AUX_E), - I915_PW("AUX_USBC1", &xelpd_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), - I915_PW("AUX_USBC2", &xelpd_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), - I915_PW("AUX_USBC3", &xelpd_pwdoms_aux_usbc3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3), - I915_PW("AUX_USBC4", &xelpd_pwdoms_aux_usbc4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC4), + I915_PW("AUX_USBC1", &tgl_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), + I915_PW("AUX_USBC2", &tgl_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), + I915_PW("AUX_USBC3", &tgl_pwdoms_aux_usbc3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3), + I915_PW("AUX_USBC4", &tgl_pwdoms_aux_usbc4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC4), ), .ops = &icl_aux_power_well_ops, .fixed_enable_delay = true, }, { .instances = &I915_PW_INSTANCES ( - I915_PW("AUX_TBT1", &xelpd_pwdoms_aux_tbt1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1), - I915_PW("AUX_TBT2", &xelpd_pwdoms_aux_tbt2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2), - I915_PW("AUX_TBT3", &xelpd_pwdoms_aux_tbt3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3), - I915_PW("AUX_TBT4", &xelpd_pwdoms_aux_tbt4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4), + I915_PW("AUX_TBT1", &icl_pwdoms_aux_tbt1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT1), + I915_PW("AUX_TBT2", &icl_pwdoms_aux_tbt2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT2), + I915_PW("AUX_TBT3", &icl_pwdoms_aux_tbt3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT3), + I915_PW("AUX_TBT4", &icl_pwdoms_aux_tbt4, .hsw.idx = TGL_PW_CTL_IDX_AUX_TBT4), ), .ops = &icl_aux_power_well_ops, .is_tc_tbt = true,
Signature · 1 line
2.30.2
PATCH v3 18/18 drm/i915: Remove the XELPD specific AUX and DDI power domains
In reply to Imre DeakThe spec calls the XELPD_D/E ports just D/E, the platform prefix in the domain names was only needed by the port->domain mapping relying on matching enum values for the whole port/domain range (and the corresponding aliasing between the platform specific domain enums). Since a previous patch we can define the port->domain mapping explicitly so do this by reusing the already existing D/E power domain names.
--- .../drm/i915/display/intel_display_power.c | 18 +++------------ .../drm/i915/display/intel_display_power.h | 9 -------- .../i915/display/intel_display_power_map.c | 22 +++++++------------ 3 files changed, 11 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +3 -15
@@ -92,10 +92,6 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "PORT_DDI_LANES_TC5" ;case POWER_DOMAIN_PORT_DDI_LANES_TC6 :return "PORT_DDI_LANES_TC6" ; -case POWER_DOMAIN_PORT_DDI_LANES_D_XELPD : -return "PORT_DDI_LANES_D_XELPD" ; -case POWER_DOMAIN_PORT_DDI_LANES_E_XELPD : -return "PORT_DDI_LANES_E_XELPD" ;case POWER_DOMAIN_PORT_DDI_IO_A :return "PORT_DDI_IO_A" ;case POWER_DOMAIN_PORT_DDI_IO_B :
@@ -120,10 +116,6 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "PORT_DDI_IO_TC5" ;case POWER_DOMAIN_PORT_DDI_IO_TC6 :return "PORT_DDI_IO_TC6" ; -case POWER_DOMAIN_PORT_DDI_IO_D_XELPD : -return "PORT_DDI_IO_D_XELPD" ; -case POWER_DOMAIN_PORT_DDI_IO_E_XELPD : -return "PORT_DDI_IO_E_XELPD" ;case POWER_DOMAIN_PORT_DSI :return "PORT_DSI" ;case POWER_DOMAIN_PORT_CRT :
@@ -160,10 +152,6 @@ intel_display_power_domain_str(enum intel_display_power_domain domain)return "AUX_USBC5" ;case POWER_DOMAIN_AUX_USBC6 :return "AUX_USBC6" ; -case POWER_DOMAIN_AUX_D_XELPD : -return "AUX_D_XELPD" ; -case POWER_DOMAIN_AUX_E_XELPD : -return "AUX_E_XELPD" ;case POWER_DOMAIN_AUX_IO_A :return "AUX_IO_A" ;case POWER_DOMAIN_AUX_TBT1 :
@@ -2390,9 +2378,9 @@ d13_port_domains[] = { .aux_ch_start = AUX_CH_D_XELPD, .aux_ch_end = AUX_CH_E_XELPD, - .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_D_XELPD, - .ddi_io = POWER_DOMAIN_PORT_DDI_IO_D_XELPD, - .aux_legacy_usbc = POWER_DOMAIN_AUX_D_XELPD, + .ddi_lanes = POWER_DOMAIN_PORT_DDI_LANES_D, + .ddi_io = POWER_DOMAIN_PORT_DDI_IO_D, + .aux_legacy_usbc = POWER_DOMAIN_AUX_D, .aux_tbt = POWER_DOMAIN_INVALID, }, };
drivers/gpu/drm/i915/display/intel_display_power.h +0 -9
@@ -56,9 +56,6 @@ enum intel_display_power_domain {POWER_DOMAIN_PORT_DDI_LANES_TC5 ,POWER_DOMAIN_PORT_DDI_LANES_TC6 , -POWER_DOMAIN_PORT_DDI_LANES_D_XELPD , -POWER_DOMAIN_PORT_DDI_LANES_E_XELPD , -POWER_DOMAIN_PORT_DDI_IO_A ,POWER_DOMAIN_PORT_DDI_IO_B , POWER_DOMAIN_PORT_DDI_IO_C,
@@ -73,9 +70,6 @@ enum intel_display_power_domain {POWER_DOMAIN_PORT_DDI_IO_TC5 ,POWER_DOMAIN_PORT_DDI_IO_TC6 , -POWER_DOMAIN_PORT_DDI_IO_D_XELPD , -POWER_DOMAIN_PORT_DDI_IO_E_XELPD , -POWER_DOMAIN_PORT_DSI ,POWER_DOMAIN_PORT_CRT , POWER_DOMAIN_PORT_OTHER,
@@ -96,9 +90,6 @@ enum intel_display_power_domain {POWER_DOMAIN_AUX_USBC5 ,POWER_DOMAIN_AUX_USBC6 , -POWER_DOMAIN_AUX_D_XELPD , -POWER_DOMAIN_AUX_E_XELPD , -POWER_DOMAIN_AUX_IO_A , POWER_DOMAIN_AUX_TBT1,
drivers/gpu/drm/i915/display/intel_display_power_map.c +8 -14
@@ -1207,8 +1207,8 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a,XELPD_PW_C_POWER_DOMAINS , \XELPD_PW_D_POWER_DOMAINS , \POWER_DOMAIN_PORT_DDI_LANES_C , \ -POWER_DOMAIN_PORT_DDI_LANES_D_XELPD , \ -POWER_DOMAIN_PORT_DDI_LANES_E_XELPD , \ +POWER_DOMAIN_PORT_DDI_LANES_D , \ +POWER_DOMAIN_PORT_DDI_LANES_E , \POWER_DOMAIN_PORT_DDI_LANES_TC1 , \POWER_DOMAIN_PORT_DDI_LANES_TC2 , \ POWER_DOMAIN_PORT_DDI_LANES_TC3, \
@@ -1216,8 +1216,8 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_pw_a,POWER_DOMAIN_VGA , \POWER_DOMAIN_AUDIO_PLAYBACK , \POWER_DOMAIN_AUX_C , \ -POWER_DOMAIN_AUX_D_XELPD , \ -POWER_DOMAIN_AUX_E_XELPD , \ +POWER_DOMAIN_AUX_D , \ +POWER_DOMAIN_AUX_E , \POWER_DOMAIN_AUX_USBC1 , \POWER_DOMAIN_AUX_USBC2 , \ POWER_DOMAIN_AUX_USBC3, \
@@ -1257,12 +1257,6 @@ I915_DECL_PW_DOMAINS(xelpd_pwdoms_dc_off,POWER_DOMAIN_MODESET , POWER_DOMAIN_INIT); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_d_xelpd,POWER_DOMAIN_AUX_D_XELPD ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_aux_e_xelpd,POWER_DOMAIN_AUX_E_XELPD ); - -I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_d_xelpd,POWER_DOMAIN_PORT_DDI_IO_D_XELPD ); -I915_DECL_PW_DOMAINS (xelpd_pwdoms_ddi_io_e_xelpd,POWER_DOMAIN_PORT_DDI_IO_E_XELPD ); -static const struct i915_power_well_desc xelpd_power_wells_main[] = { { .instances = &I915_PW_INSTANCES(
@@ -1316,8 +1310,8 @@ static const struct i915_power_well_desc xelpd_power_wells_main[] = { I915_PW("DDI_IO_A", &glk_pwdoms_ddi_io_a, .hsw.idx = ICL_PW_CTL_IDX_DDI_A), I915_PW("DDI_IO_B", &glk_pwdoms_ddi_io_b, .hsw.idx = ICL_PW_CTL_IDX_DDI_B), I915_PW("DDI_IO_C", &glk_pwdoms_ddi_io_c, .hsw.idx = ICL_PW_CTL_IDX_DDI_C), - I915_PW("DDI_IO_D_XELPD", &xelpd_pwdoms_ddi_io_d_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_DDI_D), - I915_PW("DDI_IO_E_XELPD", &xelpd_pwdoms_ddi_io_e_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_DDI_E), + I915_PW("DDI_IO_D", &icl_pwdoms_ddi_io_d, .hsw.idx = XELPD_PW_CTL_IDX_DDI_D), + I915_PW("DDI_IO_E", &icl_pwdoms_ddi_io_e, .hsw.idx = XELPD_PW_CTL_IDX_DDI_E), I915_PW("DDI_IO_TC1", &tgl_pwdoms_ddi_io_tc1, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC1), I915_PW("DDI_IO_TC2", &tgl_pwdoms_ddi_io_tc2, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC2), I915_PW("DDI_IO_TC3", &tgl_pwdoms_ddi_io_tc3, .hsw.idx = TGL_PW_CTL_IDX_DDI_TC3),
@@ -1329,8 +1323,8 @@ static const struct i915_power_well_desc xelpd_power_wells_main[] = { I915_PW("AUX_A", &icl_pwdoms_aux_a, .hsw.idx = ICL_PW_CTL_IDX_AUX_A), I915_PW("AUX_B", &icl_pwdoms_aux_b, .hsw.idx = ICL_PW_CTL_IDX_AUX_B), I915_PW("AUX_C", &icl_pwdoms_aux_c, .hsw.idx = ICL_PW_CTL_IDX_AUX_C), - I915_PW("AUX_D_XELPD", &xelpd_pwdoms_aux_d_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_AUX_D), - I915_PW("AUX_E_XELPD", &xelpd_pwdoms_aux_e_xelpd, .hsw.idx = XELPD_PW_CTL_IDX_AUX_E), + I915_PW("AUX_D", &icl_pwdoms_aux_d, .hsw.idx = XELPD_PW_CTL_IDX_AUX_D), + I915_PW("AUX_E", &icl_pwdoms_aux_e, .hsw.idx = XELPD_PW_CTL_IDX_AUX_E), I915_PW("AUX_USBC1", &tgl_pwdoms_aux_usbc1, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1), I915_PW("AUX_USBC2", &tgl_pwdoms_aux_usbc2, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC2), I915_PW("AUX_USBC3", &tgl_pwdoms_aux_usbc3, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC3),
Signature · 1 line
2.30.2