|
@@ -1968,6 +1968,50 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder)
|
|
mutex_unlock(&dev_priv->dpio_lock);
|
|
mutex_unlock(&dev_priv->dpio_lock);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void chv_pre_enable_dp(struct intel_encoder *encoder)
|
|
|
|
+{
|
|
|
|
+ struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
|
|
|
|
+ struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
|
|
|
|
+ struct drm_device *dev = encoder->base.dev;
|
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
+ struct edp_power_seq power_seq;
|
|
|
|
+ struct intel_crtc *intel_crtc =
|
|
|
|
+ to_intel_crtc(encoder->base.crtc);
|
|
|
|
+ enum dpio_channel ch = vlv_dport_to_channel(dport);
|
|
|
|
+ int pipe = intel_crtc->pipe;
|
|
|
|
+ int data, i;
|
|
|
|
+
|
|
|
|
+ /* Program Tx lane latency optimal setting*/
|
|
|
|
+ mutex_lock(&dev_priv->dpio_lock);
|
|
|
|
+ for (i = 0; i < 4; i++) {
|
|
|
|
+ /* Set the latency optimal bit */
|
|
|
|
+ data = (i == 1) ? 0x0 : 0x6;
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, CHV_TX_DW11(ch, i),
|
|
|
|
+ data << DPIO_FRC_LATENCY_SHFIT);
|
|
|
|
+
|
|
|
|
+ /* Set the upar bit */
|
|
|
|
+ data = (i == 1) ? 0x0 : 0x1;
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, CHV_TX_DW14(ch, i),
|
|
|
|
+ data << DPIO_UPAR_SHIFT);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /* Data lane stagger programming */
|
|
|
|
+ /* FIXME: Fix up value only after power analysis */
|
|
|
|
+
|
|
|
|
+ mutex_unlock(&dev_priv->dpio_lock);
|
|
|
|
+
|
|
|
|
+ if (is_edp(intel_dp)) {
|
|
|
|
+ /* init power sequencer on this pipe and port */
|
|
|
|
+ intel_dp_init_panel_power_sequencer(dev, intel_dp, &power_seq);
|
|
|
|
+ intel_dp_init_panel_power_sequencer_registers(dev, intel_dp,
|
|
|
|
+ &power_seq);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ intel_enable_dp(encoder);
|
|
|
|
+
|
|
|
|
+ vlv_wait_port_ready(dev_priv, dport);
|
|
|
|
+}
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* Native read with retry for link status and receiver capability reads for
|
|
* Native read with retry for link status and receiver capability reads for
|
|
* cases where the sink may still be asleep.
|
|
* cases where the sink may still be asleep.
|
|
@@ -2192,6 +2236,142 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static uint32_t intel_chv_signal_levels(struct intel_dp *intel_dp)
|
|
|
|
+{
|
|
|
|
+ struct drm_device *dev = intel_dp_to_dev(intel_dp);
|
|
|
|
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
+ struct intel_digital_port *dport = dp_to_dig_port(intel_dp);
|
|
|
|
+ struct intel_crtc *intel_crtc = to_intel_crtc(dport->base.base.crtc);
|
|
|
|
+ u32 deemph_reg_value, margin_reg_value, val, tx_dw2;
|
|
|
|
+ uint8_t train_set = intel_dp->train_set[0];
|
|
|
|
+ enum dpio_channel ch = vlv_dport_to_channel(dport);
|
|
|
|
+ int pipe = intel_crtc->pipe;
|
|
|
|
+
|
|
|
|
+ switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) {
|
|
|
|
+ case DP_TRAIN_PRE_EMPHASIS_0:
|
|
|
|
+ switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_400:
|
|
|
|
+ deemph_reg_value = 128;
|
|
|
|
+ margin_reg_value = 52;
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_600:
|
|
|
|
+ deemph_reg_value = 128;
|
|
|
|
+ margin_reg_value = 77;
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_800:
|
|
|
|
+ deemph_reg_value = 128;
|
|
|
|
+ margin_reg_value = 102;
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_1200:
|
|
|
|
+ deemph_reg_value = 128;
|
|
|
|
+ margin_reg_value = 154;
|
|
|
|
+ /* FIXME extra to set for 1200 */
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_PRE_EMPHASIS_3_5:
|
|
|
|
+ switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_400:
|
|
|
|
+ deemph_reg_value = 85;
|
|
|
|
+ margin_reg_value = 78;
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_600:
|
|
|
|
+ deemph_reg_value = 85;
|
|
|
|
+ margin_reg_value = 116;
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_800:
|
|
|
|
+ deemph_reg_value = 85;
|
|
|
|
+ margin_reg_value = 154;
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_PRE_EMPHASIS_6:
|
|
|
|
+ switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_400:
|
|
|
|
+ deemph_reg_value = 64;
|
|
|
|
+ margin_reg_value = 104;
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_600:
|
|
|
|
+ deemph_reg_value = 64;
|
|
|
|
+ margin_reg_value = 154;
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
|
|
+ case DP_TRAIN_PRE_EMPHASIS_9_5:
|
|
|
|
+ switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
|
|
|
|
+ case DP_TRAIN_VOLTAGE_SWING_400:
|
|
|
|
+ deemph_reg_value = 43;
|
|
|
|
+ margin_reg_value = 154;
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ mutex_lock(&dev_priv->dpio_lock);
|
|
|
|
+
|
|
|
|
+ /* Clear calc init */
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, CHV_PCS_DW10(ch), 0);
|
|
|
|
+
|
|
|
|
+ /* Program swing deemph */
|
|
|
|
+ val = vlv_dpio_read(dev_priv, pipe, VLV_TX_DW4(ch));
|
|
|
|
+ val &= ~DPIO_SWING_DEEMPH9P5_MASK;
|
|
|
|
+ val |= deemph_reg_value << DPIO_SWING_DEEMPH9P5_SHIFT;
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, VLV_TX_DW4(ch), val);
|
|
|
|
+
|
|
|
|
+ /* Program swing margin */
|
|
|
|
+ tx_dw2 = vlv_dpio_read(dev_priv, pipe, VLV_TX_DW2(ch));
|
|
|
|
+ tx_dw2 &= ~DPIO_SWING_MARGIN_MASK;
|
|
|
|
+ tx_dw2 |= margin_reg_value << DPIO_SWING_MARGIN_SHIFT;
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, VLV_TX_DW2(ch), tx_dw2);
|
|
|
|
+
|
|
|
|
+ /* Disable unique transition scale */
|
|
|
|
+ val = vlv_dpio_read(dev_priv, pipe, VLV_TX_DW3(ch));
|
|
|
|
+ val &= ~DPIO_TX_UNIQ_TRANS_SCALE_EN;
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, VLV_TX_DW3(ch), val);
|
|
|
|
+
|
|
|
|
+ if (((train_set & DP_TRAIN_PRE_EMPHASIS_MASK)
|
|
|
|
+ == DP_TRAIN_PRE_EMPHASIS_0) &&
|
|
|
|
+ ((train_set & DP_TRAIN_VOLTAGE_SWING_MASK)
|
|
|
|
+ == DP_TRAIN_VOLTAGE_SWING_1200)) {
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * The document said it needs to set bit 27 for ch0 and bit 26
|
|
|
|
+ * for ch1. Might be a typo in the doc.
|
|
|
|
+ * For now, for this unique transition scale selection, set bit
|
|
|
|
+ * 27 for ch0 and ch1.
|
|
|
|
+ */
|
|
|
|
+ val = vlv_dpio_read(dev_priv, pipe, VLV_TX_DW3(ch));
|
|
|
|
+ val |= DPIO_TX_UNIQ_TRANS_SCALE_EN;
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, VLV_TX_DW3(ch), val);
|
|
|
|
+
|
|
|
|
+ tx_dw2 |= (0x9a << DPIO_UNIQ_TRANS_SCALE_SHIFT);
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, VLV_TX_DW2(ch), tx_dw2);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /* Start swing calculation */
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, CHV_PCS_DW10(ch),
|
|
|
|
+ (DPIO_PCS_SWING_CALC_TX0_TX2 | DPIO_PCS_SWING_CALC_TX1_TX3));
|
|
|
|
+
|
|
|
|
+ /* LRC Bypass */
|
|
|
|
+ val = vlv_dpio_read(dev_priv, pipe, CHV_CMN_DW30);
|
|
|
|
+ val |= DPIO_LRC_BYPASS;
|
|
|
|
+ vlv_dpio_write(dev_priv, pipe, CHV_CMN_DW30, val);
|
|
|
|
+
|
|
|
|
+ mutex_unlock(&dev_priv->dpio_lock);
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
|
static void
|
|
static void
|
|
intel_get_adjust_train(struct intel_dp *intel_dp,
|
|
intel_get_adjust_train(struct intel_dp *intel_dp,
|
|
const uint8_t link_status[DP_LINK_STATUS_SIZE])
|
|
const uint8_t link_status[DP_LINK_STATUS_SIZE])
|
|
@@ -2406,6 +2586,9 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp, uint32_t *DP)
|
|
} else if (IS_HASWELL(dev)) {
|
|
} else if (IS_HASWELL(dev)) {
|
|
signal_levels = intel_hsw_signal_levels(train_set);
|
|
signal_levels = intel_hsw_signal_levels(train_set);
|
|
mask = DDI_BUF_EMP_MASK;
|
|
mask = DDI_BUF_EMP_MASK;
|
|
|
|
+ } else if (IS_CHERRYVIEW(dev)) {
|
|
|
|
+ signal_levels = intel_chv_signal_levels(intel_dp);
|
|
|
|
+ mask = 0;
|
|
} else if (IS_VALLEYVIEW(dev)) {
|
|
} else if (IS_VALLEYVIEW(dev)) {
|
|
signal_levels = intel_vlv_signal_levels(intel_dp);
|
|
signal_levels = intel_vlv_signal_levels(intel_dp);
|
|
mask = 0;
|
|
mask = 0;
|
|
@@ -4037,7 +4220,10 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port)
|
|
intel_encoder->disable = intel_disable_dp;
|
|
intel_encoder->disable = intel_disable_dp;
|
|
intel_encoder->get_hw_state = intel_dp_get_hw_state;
|
|
intel_encoder->get_hw_state = intel_dp_get_hw_state;
|
|
intel_encoder->get_config = intel_dp_get_config;
|
|
intel_encoder->get_config = intel_dp_get_config;
|
|
- if (IS_VALLEYVIEW(dev)) {
|
|
|
|
|
|
+ if (IS_CHERRYVIEW(dev)) {
|
|
|
|
+ intel_encoder->pre_enable = chv_pre_enable_dp;
|
|
|
|
+ intel_encoder->enable = vlv_enable_dp;
|
|
|
|
+ } else if (IS_VALLEYVIEW(dev)) {
|
|
intel_encoder->pre_pll_enable = vlv_dp_pre_pll_enable;
|
|
intel_encoder->pre_pll_enable = vlv_dp_pre_pll_enable;
|
|
intel_encoder->pre_enable = vlv_pre_enable_dp;
|
|
intel_encoder->pre_enable = vlv_pre_enable_dp;
|
|
intel_encoder->enable = vlv_enable_dp;
|
|
intel_encoder->enable = vlv_enable_dp;
|