diff options
author | Sonika Jindal <sonika.jindal@intel.com> | 2014-08-08 06:53:43 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-03 05:05:38 -0400 |
commit | 31160006f8b5aabc3701b22feccbc9a4ae9c59b1 (patch) | |
tree | a8f332e6661882a3de54f4d56e90430b162afeba /drivers/gpu/drm/gma500 | |
parent | 0ded925435ba40e1328565d3de869b3635207ef2 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/gma500')
-rw-r--r-- | drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/gma500/intel_bios.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c index a4cc0e60a1be..9f158eab517a 100644 --- 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[] = { | |||
1089 | }; | 1089 | }; |
1090 | #endif | 1090 | #endif |
1091 | 1091 | ||
1092 | #define CDV_DP_VOLTAGE_MAX DP_TRAIN_VOLTAGE_SWING_1200 | 1092 | #define CDV_DP_VOLTAGE_MAX DP_TRAIN_VOLTAGE_SWING_LEVEL_3 |
1093 | /* | 1093 | /* |
1094 | static uint8_t | 1094 | static uint8_t |
1095 | cdv_intel_dp_pre_emphasis_max(uint8_t voltage_swing) | 1095 | 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 | |||
1276 | cdv_sb_write(dev, ddi_reg->VSwing2, dp_vswing_premph_table[index]); | 1276 | cdv_sb_write(dev, ddi_reg->VSwing2, dp_vswing_premph_table[index]); |
1277 | 1277 | ||
1278 | /* ;gfx_dpio_set_reg(0x814c, 0x40802040) */ | 1278 | /* ;gfx_dpio_set_reg(0x814c, 0x40802040) */ |
1279 | if ((vswing + premph) == DP_TRAIN_VOLTAGE_SWING_1200) | 1279 | if ((vswing + premph) == DP_TRAIN_VOLTAGE_SWING_LEVEL_3) |
1280 | cdv_sb_write(dev, ddi_reg->VSwing3, 0x70802040); | 1280 | cdv_sb_write(dev, ddi_reg->VSwing3, 0x70802040); |
1281 | else | 1281 | else |
1282 | cdv_sb_write(dev, ddi_reg->VSwing3, 0x40802040); | 1282 | 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 d3497348c4d5..63bde4e86c6a 100644 --- 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) | |||
116 | 116 | ||
117 | switch (edp_link_params->preemphasis) { | 117 | switch (edp_link_params->preemphasis) { |
118 | case 0: | 118 | case 0: |
119 | dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_0; | 119 | dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_0; |
120 | break; | 120 | break; |
121 | case 1: | 121 | case 1: |
122 | dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_3_5; | 122 | dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_1; |
123 | break; | 123 | break; |
124 | case 2: | 124 | case 2: |
125 | dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_6; | 125 | dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_2; |
126 | break; | 126 | break; |
127 | case 3: | 127 | case 3: |
128 | dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_9_5; | 128 | dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_3; |
129 | break; | 129 | break; |
130 | } | 130 | } |
131 | switch (edp_link_params->vswing) { | 131 | switch (edp_link_params->vswing) { |
132 | case 0: | 132 | case 0: |
133 | dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_400; | 133 | dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_0; |
134 | break; | 134 | break; |
135 | case 1: | 135 | case 1: |
136 | dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_600; | 136 | dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_1; |
137 | break; | 137 | break; |
138 | case 2: | 138 | case 2: |
139 | dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_800; | 139 | dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_2; |
140 | break; | 140 | break; |
141 | case 3: | 141 | case 3: |
142 | dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_1200; | 142 | dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_3; |
143 | break; | 143 | break; |
144 | } | 144 | } |
145 | DRM_DEBUG_KMS("VBT reports EDP: VSwing %d, Preemph %d\n", | 145 | DRM_DEBUG_KMS("VBT reports EDP: VSwing %d, Preemph %d\n", |