On Fri, Aug 08, 2014 at 04:23:41PM +0530, sonika.jindal@xxxxxxxxx wrote:
> From: Sonika Jindal <sonika.jindal@xxxxxxxxx>
>
> Rename the defines to have levels instead of values for vswing and
> pre-emph levels as the values may differ in other scenarios like low vswing of
> eDP1.4 where the values are different.
>
> Done using following cocci patch for each define:
> @@
> @@
>
> # define DP_TRAIN_VOLTAGE_SWING_400 (0 << 0)
> + # define DP_TRAIN_VOLTAGE_SWING_LEVEL_0 (0 << 0)
>
> ...
>
> Signed-off-by: Sonika Jindal <sonika.jindal@xxxxxxxxx>
Reviewed-by: Damien Lespiau <damien.lespiau@xxxxxxxxx>
--
Damien
> ---
> drivers/gpu/drm/i915/intel_bios.c | 16 +--
> drivers/gpu/drm/i915/intel_dp.c | 194 ++++++++++++++++++-------------------
> 2 files changed, 105 insertions(+), 105 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
> index 031c565..e871f68 100644
> --- a/drivers/gpu/drm/i915/intel_bios.c
> +++ b/drivers/gpu/drm/i915/intel_bios.c
> @@ -627,16 +627,16 @@ parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb)
>
> switch (edp_link_params->preemphasis) {
> case EDP_PREEMPHASIS_NONE:
> - dev_priv->vbt.edp_preemphasis = DP_TRAIN_PRE_EMPHASIS_0;
> + dev_priv->vbt.edp_preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_0;
> break;
> case EDP_PREEMPHASIS_3_5dB:
> - dev_priv->vbt.edp_preemphasis = DP_TRAIN_PRE_EMPHASIS_3_5;
> + dev_priv->vbt.edp_preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_1;
> break;
> case EDP_PREEMPHASIS_6dB:
> - dev_priv->vbt.edp_preemphasis = DP_TRAIN_PRE_EMPHASIS_6;
> + dev_priv->vbt.edp_preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_2;
> break;
> case EDP_PREEMPHASIS_9_5dB:
> - dev_priv->vbt.edp_preemphasis = DP_TRAIN_PRE_EMPHASIS_9_5;
> + dev_priv->vbt.edp_preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_3;
> break;
> default:
> DRM_DEBUG_KMS("VBT has unknown eDP pre-emphasis value %u\n",
> @@ -646,16 +646,16 @@ parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb)
>
> switch (edp_link_params->vswing) {
> case EDP_VSWING_0_4V:
> - dev_priv->vbt.edp_vswing = DP_TRAIN_VOLTAGE_SWING_400;
> + dev_priv->vbt.edp_vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_0;
> break;
> case EDP_VSWING_0_6V:
> - dev_priv->vbt.edp_vswing = DP_TRAIN_VOLTAGE_SWING_600;
> + dev_priv->vbt.edp_vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_1;
> break;
> case EDP_VSWING_0_8V:
> - dev_priv->vbt.edp_vswing = DP_TRAIN_VOLTAGE_SWING_800;
> + dev_priv->vbt.edp_vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_2;
> break;
> case EDP_VSWING_1_2V:
> - dev_priv->vbt.edp_vswing = DP_TRAIN_VOLTAGE_SWING_1200;
> + dev_priv->vbt.edp_vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_3;
> break;
> default:
> DRM_DEBUG_KMS("VBT has unknown eDP voltage swing value %u\n",
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 34e3c47..01f264c 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2381,13 +2381,13 @@ intel_dp_voltage_max(struct intel_dp *intel_dp)
> enum port port = dp_to_dig_port(intel_dp)->port;
>
> if (IS_VALLEYVIEW(dev))
> - return DP_TRAIN_VOLTAGE_SWING_1200;
> + return DP_TRAIN_VOLTAGE_SWING_LEVEL_3;
> else if (IS_GEN7(dev) && port == PORT_A)
> - return DP_TRAIN_VOLTAGE_SWING_800;
> + return DP_TRAIN_VOLTAGE_SWING_LEVEL_2;
> else if (HAS_PCH_CPT(dev) && port != PORT_A)
> - return DP_TRAIN_VOLTAGE_SWING_1200;
> + return DP_TRAIN_VOLTAGE_SWING_LEVEL_3;
> else
> - return DP_TRAIN_VOLTAGE_SWING_800;
> + return DP_TRAIN_VOLTAGE_SWING_LEVEL_2;
> }
>
> static uint8_t
> @@ -2398,49 +2398,49 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing)
>
> if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {
> switch (voltage_swing & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> - return DP_TRAIN_PRE_EMPHASIS_9_5;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> - return DP_TRAIN_PRE_EMPHASIS_6;
> - case DP_TRAIN_VOLTAGE_SWING_800:
> - return DP_TRAIN_PRE_EMPHASIS_3_5;
> - case DP_TRAIN_VOLTAGE_SWING_1200:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> + return DP_TRAIN_PRE_EMPH_LEVEL_3;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> + return DP_TRAIN_PRE_EMPH_LEVEL_2;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> + return DP_TRAIN_PRE_EMPH_LEVEL_1;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_3:
> default:
> - return DP_TRAIN_PRE_EMPHASIS_0;
> + return DP_TRAIN_PRE_EMPH_LEVEL_0;
> }
> } else if (IS_VALLEYVIEW(dev)) {
> switch (voltage_swing & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> - return DP_TRAIN_PRE_EMPHASIS_9_5;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> - return DP_TRAIN_PRE_EMPHASIS_6;
> - case DP_TRAIN_VOLTAGE_SWING_800:
> - return DP_TRAIN_PRE_EMPHASIS_3_5;
> - case DP_TRAIN_VOLTAGE_SWING_1200:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> + return DP_TRAIN_PRE_EMPH_LEVEL_3;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> + return DP_TRAIN_PRE_EMPH_LEVEL_2;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> + return DP_TRAIN_PRE_EMPH_LEVEL_1;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_3:
> default:
> - return DP_TRAIN_PRE_EMPHASIS_0;
> + return DP_TRAIN_PRE_EMPH_LEVEL_0;
> }
> } else if (IS_GEN7(dev) && port == PORT_A) {
> switch (voltage_swing & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> - return DP_TRAIN_PRE_EMPHASIS_6;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> - case DP_TRAIN_VOLTAGE_SWING_800:
> - return DP_TRAIN_PRE_EMPHASIS_3_5;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> + return DP_TRAIN_PRE_EMPH_LEVEL_2;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> + return DP_TRAIN_PRE_EMPH_LEVEL_1;
> default:
> - return DP_TRAIN_PRE_EMPHASIS_0;
> + return DP_TRAIN_PRE_EMPH_LEVEL_0;
> }
> } else {
> switch (voltage_swing & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> - return DP_TRAIN_PRE_EMPHASIS_6;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> - return DP_TRAIN_PRE_EMPHASIS_6;
> - case DP_TRAIN_VOLTAGE_SWING_800:
> - return DP_TRAIN_PRE_EMPHASIS_3_5;
> - case DP_TRAIN_VOLTAGE_SWING_1200:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> + return DP_TRAIN_PRE_EMPH_LEVEL_2;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> + return DP_TRAIN_PRE_EMPH_LEVEL_2;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> + return DP_TRAIN_PRE_EMPH_LEVEL_1;
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_3:
> default:
> - return DP_TRAIN_PRE_EMPHASIS_0;
> + return DP_TRAIN_PRE_EMPH_LEVEL_0;
> }
> }
> }
> @@ -2459,22 +2459,22 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)
> int pipe = intel_crtc->pipe;
>
> switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) {
> - case DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_PRE_EMPH_LEVEL_0:
> preemph_reg_value = 0x0004000;
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> demph_reg_value = 0x2B405555;
> uniqtranscale_reg_value = 0x552AB83A;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> demph_reg_value = 0x2B404040;
> uniqtranscale_reg_value = 0x5548B83A;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_800:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> demph_reg_value = 0x2B245555;
> uniqtranscale_reg_value = 0x5560B83A;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_1200:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_3:
> demph_reg_value = 0x2B405555;
> uniqtranscale_reg_value = 0x5598DA3A;
> break;
> @@ -2482,18 +2482,18 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)
> return 0;
> }
> break;
> - case DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_PRE_EMPH_LEVEL_1:
> preemph_reg_value = 0x0002000;
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> demph_reg_value = 0x2B404040;
> uniqtranscale_reg_value = 0x5552B83A;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> demph_reg_value = 0x2B404848;
> uniqtranscale_reg_value = 0x5580B83A;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_800:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> demph_reg_value = 0x2B404040;
> uniqtranscale_reg_value = 0x55ADDA3A;
> break;
> @@ -2501,14 +2501,14 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)
> return 0;
> }
> break;
> - case DP_TRAIN_PRE_EMPHASIS_6:
> + case DP_TRAIN_PRE_EMPH_LEVEL_2:
> preemph_reg_value = 0x0000000;
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> demph_reg_value = 0x2B305555;
> uniqtranscale_reg_value = 0x5570B83A;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> demph_reg_value = 0x2B2B4040;
> uniqtranscale_reg_value = 0x55ADDA3A;
> break;
> @@ -2516,10 +2516,10 @@ static uint32_t intel_vlv_signal_levels(struct intel_dp *intel_dp)
> return 0;
> }
> break;
> - case DP_TRAIN_PRE_EMPHASIS_9_5:
> + case DP_TRAIN_PRE_EMPH_LEVEL_3:
> preemph_reg_value = 0x0006000;
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> demph_reg_value = 0x1B405555;
> uniqtranscale_reg_value = 0x55ADDA3A;
> break;
> @@ -2558,21 +2558,21 @@ static uint32_t intel_chv_signal_levels(struct intel_dp *intel_dp)
> int i;
>
> switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) {
> - case DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_PRE_EMPH_LEVEL_0:
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> deemph_reg_value = 128;
> margin_reg_value = 52;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> deemph_reg_value = 128;
> margin_reg_value = 77;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_800:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> deemph_reg_value = 128;
> margin_reg_value = 102;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_1200:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_3:
> deemph_reg_value = 128;
> margin_reg_value = 154;
> /* FIXME extra to set for 1200 */
> @@ -2581,17 +2581,17 @@ static uint32_t intel_chv_signal_levels(struct intel_dp *intel_dp)
> return 0;
> }
> break;
> - case DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_PRE_EMPH_LEVEL_1:
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> deemph_reg_value = 85;
> margin_reg_value = 78;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> deemph_reg_value = 85;
> margin_reg_value = 116;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_800:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> deemph_reg_value = 85;
> margin_reg_value = 154;
> break;
> @@ -2599,13 +2599,13 @@ static uint32_t intel_chv_signal_levels(struct intel_dp *intel_dp)
> return 0;
> }
> break;
> - case DP_TRAIN_PRE_EMPHASIS_6:
> + case DP_TRAIN_PRE_EMPH_LEVEL_2:
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> deemph_reg_value = 64;
> margin_reg_value = 104;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> deemph_reg_value = 64;
> margin_reg_value = 154;
> break;
> @@ -2613,9 +2613,9 @@ static uint32_t intel_chv_signal_levels(struct intel_dp *intel_dp)
> return 0;
> }
> break;
> - case DP_TRAIN_PRE_EMPHASIS_9_5:
> + case DP_TRAIN_PRE_EMPH_LEVEL_3:
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> deemph_reg_value = 43;
> margin_reg_value = 154;
> break;
> @@ -2662,9 +2662,9 @@ static uint32_t intel_chv_signal_levels(struct intel_dp *intel_dp)
> }
>
> if (((train_set & DP_TRAIN_PRE_EMPHASIS_MASK)
> - == DP_TRAIN_PRE_EMPHASIS_0) &&
> + == DP_TRAIN_PRE_EMPH_LEVEL_0) &&
> ((train_set & DP_TRAIN_VOLTAGE_SWING_MASK)
> - == DP_TRAIN_VOLTAGE_SWING_1200)) {
> + == DP_TRAIN_VOLTAGE_SWING_LEVEL_3)) {
>
> /*
> * The document said it needs to set bit 27 for ch0 and bit 26
> @@ -2743,32 +2743,32 @@ intel_gen4_signal_levels(uint8_t train_set)
> uint32_t signal_levels = 0;
>
> switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
> - case DP_TRAIN_VOLTAGE_SWING_400:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
> default:
> signal_levels |= DP_VOLTAGE_0_4;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_600:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1:
> signal_levels |= DP_VOLTAGE_0_6;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_800:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2:
> signal_levels |= DP_VOLTAGE_0_8;
> break;
> - case DP_TRAIN_VOLTAGE_SWING_1200:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_3:
> signal_levels |= DP_VOLTAGE_1_2;
> break;
> }
> switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) {
> - case DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_PRE_EMPH_LEVEL_0:
> default:
> signal_levels |= DP_PRE_EMPHASIS_0;
> break;
> - case DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_PRE_EMPH_LEVEL_1:
> signal_levels |= DP_PRE_EMPHASIS_3_5;
> break;
> - case DP_TRAIN_PRE_EMPHASIS_6:
> + case DP_TRAIN_PRE_EMPH_LEVEL_2:
> signal_levels |= DP_PRE_EMPHASIS_6;
> break;
> - case DP_TRAIN_PRE_EMPHASIS_9_5:
> + case DP_TRAIN_PRE_EMPH_LEVEL_3:
> signal_levels |= DP_PRE_EMPHASIS_9_5;
> break;
> }
> @@ -2782,19 +2782,19 @@ intel_gen6_edp_signal_levels(uint8_t train_set)
> int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
> DP_TRAIN_PRE_EMPHASIS_MASK);
> switch (signal_levels) {
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_0:
> - case DP_TRAIN_VOLTAGE_SWING_600 | DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> return EDP_LINK_TRAIN_400_600MV_0DB_SNB_B;
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> return EDP_LINK_TRAIN_400MV_3_5DB_SNB_B;
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_6:
> - case DP_TRAIN_VOLTAGE_SWING_600 | DP_TRAIN_PRE_EMPHASIS_6:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_2:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_2:
> return EDP_LINK_TRAIN_400_600MV_6DB_SNB_B;
> - case DP_TRAIN_VOLTAGE_SWING_600 | DP_TRAIN_PRE_EMPHASIS_3_5:
> - case DP_TRAIN_VOLTAGE_SWING_800 | DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> return EDP_LINK_TRAIN_600_800MV_3_5DB_SNB_B;
> - case DP_TRAIN_VOLTAGE_SWING_800 | DP_TRAIN_PRE_EMPHASIS_0:
> - case DP_TRAIN_VOLTAGE_SWING_1200 | DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_3 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> return EDP_LINK_TRAIN_800_1200MV_0DB_SNB_B;
> default:
> DRM_DEBUG_KMS("Unsupported voltage swing/pre-emphasis level:"
> @@ -2810,21 +2810,21 @@ intel_gen7_edp_signal_levels(uint8_t train_set)
> int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
> DP_TRAIN_PRE_EMPHASIS_MASK);
> switch (signal_levels) {
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> return EDP_LINK_TRAIN_400MV_0DB_IVB;
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> return EDP_LINK_TRAIN_400MV_3_5DB_IVB;
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_6:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_2:
> return EDP_LINK_TRAIN_400MV_6DB_IVB;
>
> - case DP_TRAIN_VOLTAGE_SWING_600 | DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> return EDP_LINK_TRAIN_600MV_0DB_IVB;
> - case DP_TRAIN_VOLTAGE_SWING_600 | DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> return EDP_LINK_TRAIN_600MV_3_5DB_IVB;
>
> - case DP_TRAIN_VOLTAGE_SWING_800 | DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> return EDP_LINK_TRAIN_800MV_0DB_IVB;
> - case DP_TRAIN_VOLTAGE_SWING_800 | DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> return EDP_LINK_TRAIN_800MV_3_5DB_IVB;
>
> default:
> @@ -2841,25 +2841,25 @@ intel_hsw_signal_levels(uint8_t train_set)
> int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
> DP_TRAIN_PRE_EMPHASIS_MASK);
> switch (signal_levels) {
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> return DDI_BUF_EMP_400MV_0DB_HSW;
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> return DDI_BUF_EMP_400MV_3_5DB_HSW;
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_6:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_2:
> return DDI_BUF_EMP_400MV_6DB_HSW;
> - case DP_TRAIN_VOLTAGE_SWING_400 | DP_TRAIN_PRE_EMPHASIS_9_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_3:
> return DDI_BUF_EMP_400MV_9_5DB_HSW;
>
> - case DP_TRAIN_VOLTAGE_SWING_600 | DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> return DDI_BUF_EMP_600MV_0DB_HSW;
> - case DP_TRAIN_VOLTAGE_SWING_600 | DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> return DDI_BUF_EMP_600MV_3_5DB_HSW;
> - case DP_TRAIN_VOLTAGE_SWING_600 | DP_TRAIN_PRE_EMPHASIS_6:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_2:
> return DDI_BUF_EMP_600MV_6DB_HSW;
>
> - case DP_TRAIN_VOLTAGE_SWING_800 | DP_TRAIN_PRE_EMPHASIS_0:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 | DP_TRAIN_PRE_EMPH_LEVEL_0:
> return DDI_BUF_EMP_800MV_0DB_HSW;
> - case DP_TRAIN_VOLTAGE_SWING_800 | DP_TRAIN_PRE_EMPHASIS_3_5:
> + case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 | DP_TRAIN_PRE_EMPH_LEVEL_1:
> return DDI_BUF_EMP_800MV_3_5DB_HSW;
> default:
> DRM_DEBUG_KMS("Unsupported voltage swing/pre-emphasis level:"
> --
> 1.7.10.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
