From: sonika.jindal@intel.com
To: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: [PATCH 4/7] drm/gma500: Renaming DP training vswing pre emph defines
Date: Fri, 8 Aug 2014 16:23:43 +0530 [thread overview]
Message-ID: <1407495226-12620-5-git-send-email-sonika.jindal@intel.com> (raw)
In-Reply-To: <1407495226-12620-1-git-send-email-sonika.jindal@intel.com>
From: Sonika Jindal <sonika.jindal@intel.com>
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>
---
drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 ++--
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 a4cc0e6..9f158ea 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[] = {
};
#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 d349734..63bde4e 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)
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",
--
1.7.10.4
next prev parent reply other threads:[~2014-08-08 10:53 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 10:53 [PATCH v2 0/7] Rename DP training vswing/pre-emph defines sonika.jindal
2014-08-08 10:53 ` [PATCH 1/7] drm: Renaming DP training vswing pre emph defines sonika.jindal
2014-08-11 16:59 ` [Intel-gfx] " Damien Lespiau
2014-08-26 11:28 ` Thierry Reding
2014-08-27 4:31 ` Jindal, Sonika
2014-08-28 0:34 ` Jingoo Han
2014-08-27 7:47 ` Damien Lespiau
2014-08-27 7:51 ` Damien Lespiau
2014-08-27 13:09 ` Thierry Reding
2014-08-27 13:11 ` Thierry Reding
2014-08-28 7:01 ` Damien Lespiau
2014-08-08 10:53 ` [PATCH 2/7] drm/i915: " sonika.jindal
2014-08-11 17:04 ` Damien Lespiau
2014-08-08 10:53 ` [PATCH 3/7] drm/exynos: " sonika.jindal
2014-08-28 0:55 ` Jingoo Han
2014-08-28 4:32 ` Jindal, Sonika
2014-08-28 6:06 ` Jingoo Han
2014-08-28 6:11 ` Jindal, Sonika
2014-08-08 10:53 ` sonika.jindal [this message]
2014-08-08 10:53 ` [PATCH 5/7] drm/radeon: " sonika.jindal
2014-08-08 10:53 ` [PATCH 6/7] drm/tegra: " sonika.jindal
2014-08-08 10:53 ` [PATCH 7/7] drm: Remove old defines for vswing and pre-emph values sonika.jindal
2014-08-19 8:12 ` [PATCH v2 0/7] Rename DP training vswing/pre-emph defines Jindal, Sonika
2014-08-25 12:55 ` [Intel-gfx] " Daniel Vetter
2014-08-27 6:08 ` Jindal, Sonika
2014-08-27 13:44 ` [Intel-gfx] " Deucher, Alexander
2014-09-02 20:46 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407495226-12620-5-git-send-email-sonika.jindal@intel.com \
--to=sonika.jindal@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox