|
@@ -1592,30 +1592,37 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
|
|
|
intel_runtime_pm_put(dev_priv);
|
|
|
}
|
|
|
|
|
|
-#define HSW_ALWAYS_ON_POWER_DOMAINS ( \
|
|
|
- BIT(POWER_DOMAIN_PIPE_A) | \
|
|
|
- BIT(POWER_DOMAIN_TRANSCODER_EDP) | \
|
|
|
- BIT(POWER_DOMAIN_PORT_DDI_A_LANES) | \
|
|
|
+#define HSW_DISPLAY_POWER_DOMAINS ( \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_B) | \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_C) | \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_A_PANEL_FITTER) | \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \
|
|
|
+ BIT(POWER_DOMAIN_TRANSCODER_A) | \
|
|
|
+ BIT(POWER_DOMAIN_TRANSCODER_B) | \
|
|
|
+ BIT(POWER_DOMAIN_TRANSCODER_C) | \
|
|
|
BIT(POWER_DOMAIN_PORT_DDI_B_LANES) | \
|
|
|
BIT(POWER_DOMAIN_PORT_DDI_C_LANES) | \
|
|
|
BIT(POWER_DOMAIN_PORT_DDI_D_LANES) | \
|
|
|
- BIT(POWER_DOMAIN_PORT_CRT) | \
|
|
|
- BIT(POWER_DOMAIN_PLLS) | \
|
|
|
- BIT(POWER_DOMAIN_AUX_A) | \
|
|
|
- BIT(POWER_DOMAIN_AUX_B) | \
|
|
|
- BIT(POWER_DOMAIN_AUX_C) | \
|
|
|
- BIT(POWER_DOMAIN_AUX_D) | \
|
|
|
- BIT(POWER_DOMAIN_GMBUS) | \
|
|
|
- BIT(POWER_DOMAIN_INIT))
|
|
|
-#define HSW_DISPLAY_POWER_DOMAINS ( \
|
|
|
- (POWER_DOMAIN_MASK & ~HSW_ALWAYS_ON_POWER_DOMAINS) | \
|
|
|
+ BIT(POWER_DOMAIN_PORT_CRT) | /* DDI E */ \
|
|
|
+ BIT(POWER_DOMAIN_VGA) | \
|
|
|
+ BIT(POWER_DOMAIN_AUDIO) | \
|
|
|
BIT(POWER_DOMAIN_INIT))
|
|
|
|
|
|
-#define BDW_ALWAYS_ON_POWER_DOMAINS ( \
|
|
|
- HSW_ALWAYS_ON_POWER_DOMAINS | \
|
|
|
- BIT(POWER_DOMAIN_PIPE_A_PANEL_FITTER))
|
|
|
-#define BDW_DISPLAY_POWER_DOMAINS ( \
|
|
|
- (POWER_DOMAIN_MASK & ~BDW_ALWAYS_ON_POWER_DOMAINS) | \
|
|
|
+#define BDW_DISPLAY_POWER_DOMAINS ( \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_B) | \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_C) | \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_B_PANEL_FITTER) | \
|
|
|
+ BIT(POWER_DOMAIN_PIPE_C_PANEL_FITTER) | \
|
|
|
+ BIT(POWER_DOMAIN_TRANSCODER_A) | \
|
|
|
+ BIT(POWER_DOMAIN_TRANSCODER_B) | \
|
|
|
+ BIT(POWER_DOMAIN_TRANSCODER_C) | \
|
|
|
+ BIT(POWER_DOMAIN_PORT_DDI_B_LANES) | \
|
|
|
+ BIT(POWER_DOMAIN_PORT_DDI_C_LANES) | \
|
|
|
+ BIT(POWER_DOMAIN_PORT_DDI_D_LANES) | \
|
|
|
+ BIT(POWER_DOMAIN_PORT_CRT) | /* DDI E */ \
|
|
|
+ BIT(POWER_DOMAIN_VGA) | \
|
|
|
+ BIT(POWER_DOMAIN_AUDIO) | \
|
|
|
BIT(POWER_DOMAIN_INIT))
|
|
|
|
|
|
#define VLV_DISPLAY_POWER_DOMAINS ( \
|