drm/i915: Fix ibx max vswing/preemph

IBX supports vswing level 3 and pre-emphasis level 3. Don't
limit it to level 2 for those.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200512174145.3186-3-ville.syrjala@linux.intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 338f6d046de332045c99bbe87a2f04cc9841c380..67cb712f2d8fc246cc7d4824e94238facb42b302 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -4001,7 +4001,7 @@ intel_dp_voltage_max(struct intel_dp *intel_dp)
        if (HAS_DDI(dev_priv))
                return intel_ddi_dp_voltage_max(encoder);
        else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv) ||
-                (HAS_PCH_CPT(dev_priv) && port != PORT_A))
+                (HAS_PCH_SPLIT(dev_priv) && port != PORT_A))
                return DP_TRAIN_VOLTAGE_SWING_LEVEL_3;
        else if (IS_IVYBRIDGE(dev_priv) && port == PORT_A)
                return DP_TRAIN_VOLTAGE_SWING_LEVEL_2;
@@ -4019,7 +4019,7 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, u8 voltage_swing)
        if (HAS_DDI(dev_priv)) {
                return intel_ddi_dp_pre_emphasis_max(encoder, voltage_swing);
        } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv) ||
-                  (HAS_PCH_CPT(dev_priv) && port != PORT_A)) {
+                  (HAS_PCH_SPLIT(dev_priv) && port != PORT_A)) {
                switch (voltage_swing & DP_TRAIN_VOLTAGE_SWING_MASK) {
                case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
                        return DP_TRAIN_PRE_EMPH_LEVEL_3;