|
@@ -794,7 +794,8 @@ static void intel_pps_get_registers(struct intel_dp *intel_dp,
|
|
regs->pp_stat = PP_STATUS(pps_idx);
|
|
regs->pp_stat = PP_STATUS(pps_idx);
|
|
regs->pp_on = PP_ON_DELAYS(pps_idx);
|
|
regs->pp_on = PP_ON_DELAYS(pps_idx);
|
|
regs->pp_off = PP_OFF_DELAYS(pps_idx);
|
|
regs->pp_off = PP_OFF_DELAYS(pps_idx);
|
|
- if (!IS_GEN9_LP(dev_priv) && !HAS_PCH_CNP(dev_priv))
|
|
|
|
|
|
+ if (!IS_GEN9_LP(dev_priv) && !HAS_PCH_CNP(dev_priv) &&
|
|
|
|
+ !HAS_PCH_ICP(dev_priv))
|
|
regs->pp_div = PP_DIVISOR(pps_idx);
|
|
regs->pp_div = PP_DIVISOR(pps_idx);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -5229,7 +5230,8 @@ intel_pps_readout_hw_state(struct intel_dp *intel_dp, struct edp_power_seq *seq)
|
|
|
|
|
|
pp_on = I915_READ(regs.pp_on);
|
|
pp_on = I915_READ(regs.pp_on);
|
|
pp_off = I915_READ(regs.pp_off);
|
|
pp_off = I915_READ(regs.pp_off);
|
|
- if (!IS_GEN9_LP(dev_priv) && !HAS_PCH_CNP(dev_priv)) {
|
|
|
|
|
|
+ if (!IS_GEN9_LP(dev_priv) && !HAS_PCH_CNP(dev_priv) &&
|
|
|
|
+ !HAS_PCH_ICP(dev_priv)) {
|
|
I915_WRITE(regs.pp_ctrl, pp_ctl);
|
|
I915_WRITE(regs.pp_ctrl, pp_ctl);
|
|
pp_div = I915_READ(regs.pp_div);
|
|
pp_div = I915_READ(regs.pp_div);
|
|
}
|
|
}
|
|
@@ -5247,7 +5249,8 @@ intel_pps_readout_hw_state(struct intel_dp *intel_dp, struct edp_power_seq *seq)
|
|
seq->t10 = (pp_off & PANEL_POWER_DOWN_DELAY_MASK) >>
|
|
seq->t10 = (pp_off & PANEL_POWER_DOWN_DELAY_MASK) >>
|
|
PANEL_POWER_DOWN_DELAY_SHIFT;
|
|
PANEL_POWER_DOWN_DELAY_SHIFT;
|
|
|
|
|
|
- if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv)) {
|
|
|
|
|
|
+ if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv) ||
|
|
|
|
+ HAS_PCH_ICP(dev_priv)) {
|
|
seq->t11_t12 = ((pp_ctl & BXT_POWER_CYCLE_DELAY_MASK) >>
|
|
seq->t11_t12 = ((pp_ctl & BXT_POWER_CYCLE_DELAY_MASK) >>
|
|
BXT_POWER_CYCLE_DELAY_SHIFT) * 1000;
|
|
BXT_POWER_CYCLE_DELAY_SHIFT) * 1000;
|
|
} else {
|
|
} else {
|
|
@@ -5418,7 +5421,8 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
|
|
(seq->t10 << PANEL_POWER_DOWN_DELAY_SHIFT);
|
|
(seq->t10 << PANEL_POWER_DOWN_DELAY_SHIFT);
|
|
/* Compute the divisor for the pp clock, simply match the Bspec
|
|
/* Compute the divisor for the pp clock, simply match the Bspec
|
|
* formula. */
|
|
* formula. */
|
|
- if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv)) {
|
|
|
|
|
|
+ if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv) ||
|
|
|
|
+ HAS_PCH_ICP(dev_priv)) {
|
|
pp_div = I915_READ(regs.pp_ctrl);
|
|
pp_div = I915_READ(regs.pp_ctrl);
|
|
pp_div &= ~BXT_POWER_CYCLE_DELAY_MASK;
|
|
pp_div &= ~BXT_POWER_CYCLE_DELAY_MASK;
|
|
pp_div |= (DIV_ROUND_UP(seq->t11_t12, 1000)
|
|
pp_div |= (DIV_ROUND_UP(seq->t11_t12, 1000)
|
|
@@ -5444,7 +5448,8 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
|
|
|
|
|
|
I915_WRITE(regs.pp_on, pp_on);
|
|
I915_WRITE(regs.pp_on, pp_on);
|
|
I915_WRITE(regs.pp_off, pp_off);
|
|
I915_WRITE(regs.pp_off, pp_off);
|
|
- if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv))
|
|
|
|
|
|
+ if (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv) ||
|
|
|
|
+ HAS_PCH_ICP(dev_priv))
|
|
I915_WRITE(regs.pp_ctrl, pp_div);
|
|
I915_WRITE(regs.pp_ctrl, pp_div);
|
|
else
|
|
else
|
|
I915_WRITE(regs.pp_div, pp_div);
|
|
I915_WRITE(regs.pp_div, pp_div);
|
|
@@ -5452,7 +5457,8 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp,
|
|
DRM_DEBUG_KMS("panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n",
|
|
DRM_DEBUG_KMS("panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n",
|
|
I915_READ(regs.pp_on),
|
|
I915_READ(regs.pp_on),
|
|
I915_READ(regs.pp_off),
|
|
I915_READ(regs.pp_off),
|
|
- (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv)) ?
|
|
|
|
|
|
+ (IS_GEN9_LP(dev_priv) || HAS_PCH_CNP(dev_priv) ||
|
|
|
|
+ HAS_PCH_ICP(dev_priv)) ?
|
|
(I915_READ(regs.pp_ctrl) & BXT_POWER_CYCLE_DELAY_MASK) :
|
|
(I915_READ(regs.pp_ctrl) & BXT_POWER_CYCLE_DELAY_MASK) :
|
|
I915_READ(regs.pp_div));
|
|
I915_READ(regs.pp_div));
|
|
}
|
|
}
|