drm/gma500: Renaming DP training vswing pre emph defines

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@intel.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index a4cc0e60a1be732c035c06754571dafa09e4d0c8..9f158eab517a46c0f40ae8a8b37066e3a1e031cd 100644 (file)
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1089,7 +1089,7 @@ static char       *link_train_names[] = {
 };
 #endif
 
-#define CDV_DP_VOLTAGE_MAX         DP_TRAIN_VOLTAGE_SWING_1200
+#define CDV_DP_VOLTAGE_MAX         DP_TRAIN_VOLTAGE_SWING_LEVEL_3
 /*
 static uint8_t
 cdv_intel_dp_pre_emphasis_max(uint8_t voltage_swing)
@@ -1276,7 +1276,7 @@ cdv_intel_dp_set_vswing_premph(struct gma_encoder *encoder, uint8_t signal_level
                cdv_sb_write(dev, ddi_reg->VSwing2, dp_vswing_premph_table[index]);
 
        /* ;gfx_dpio_set_reg(0x814c, 0x40802040) */
-       if ((vswing + premph) == DP_TRAIN_VOLTAGE_SWING_1200)
+       if ((vswing + premph) == DP_TRAIN_VOLTAGE_SWING_LEVEL_3)
                cdv_sb_write(dev, ddi_reg->VSwing3, 0x70802040);
        else
                cdv_sb_write(dev, ddi_reg->VSwing3, 0x40802040);

diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c
index d3497348c4d5d81a240369d1d0dc831b30c29dbe..63bde4e86c6a11643419a099b2e3b4216a0c038b 100644 (file)
--- a/drivers/gpu/drm/gma500/intel_bios.c
+++ b/drivers/gpu/drm/gma500/intel_bios.c
@@ -116,30 +116,30 @@ parse_edp(struct drm_psb_private *dev_priv, struct bdb_header *bdb)
 
        switch (edp_link_params->preemphasis) {
        case 0:
-               dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_0;
+               dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_0;
                break;
        case 1:
-               dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_3_5;
+               dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_1;
                break;
        case 2:
-               dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_6;
+               dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_2;
                break;
        case 3:
-               dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_9_5;
+               dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_3;
                break;
        }
        switch (edp_link_params->vswing) {
        case 0:
-               dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_400;
+               dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_0;
                break;
        case 1:
-               dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_600;
+               dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_1;
                break;
        case 2:
-               dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_800;
+               dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_2;
                break;
        case 3:
-               dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_1200;
+               dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_3;
                break;
        }
        DRM_DEBUG_KMS("VBT reports EDP: VSwing  %d, Preemph %d\n",