drm/i915: De-wrapper bxt_ddi_phy_set_signal_levels()

Convert bxt_ddi_phy_set_signal_levels() to act as the full
.set_signal_levels() hook instead of going through a pointless wrapper.

Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211001130107.1746-6-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index accdf45..e6dd8ca 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1005,28 +1005,6 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,
                _skl_ddi_set_iboost(dev_priv, PORT_E, iboost);
 }
 
-static void bxt_set_signal_levels(struct intel_encoder *encoder,
-                                 const struct intel_crtc_state *crtc_state)
-{
-       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-       int level = intel_ddi_level(encoder, crtc_state);
-       const struct intel_ddi_buf_trans *trans;
-       enum port port = encoder->port;
-       int n_entries;
-
-       trans = encoder->get_buf_trans(encoder, crtc_state, &n_entries);
-       if (drm_WARN_ON_ONCE(&dev_priv->drm, !trans))
-               return;
-       if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries))
-               level = n_entries - 1;
-
-       bxt_ddi_phy_set_signal_level(dev_priv, port,
-                                    trans->entries[level].bxt.margin,
-                                    trans->entries[level].bxt.scale,
-                                    trans->entries[level].bxt.enable,
-                                    trans->entries[level].bxt.deemphasis);
-}
-
 static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp,
                                   const struct intel_crtc_state *crtc_state)
 {
@@ -4580,7 +4558,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
                else
                        encoder->set_signal_levels = icl_mg_phy_set_signal_levels;
        } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) {
-               encoder->set_signal_levels = bxt_set_signal_levels;
+               encoder->set_signal_levels = bxt_ddi_phy_set_signal_levels;
        } else {
                encoder->set_signal_levels = hsw_set_signal_levels;
        }

diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
index 48507ed..4d604e4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpio_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
@@ -23,6 +23,8 @@
 
 #include "display/intel_dp.h"
 
+#include "intel_ddi.h"
+#include "intel_ddi_buf_trans.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
 #include "intel_dpio_phy.h"
@@ -266,15 +268,24 @@ void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port,
        *ch = DPIO_CH0;
 }
 
-void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
-                                 enum port port, u32 margin, u32 scale,
-                                 u32 enable, u32 deemphasis)
+void bxt_ddi_phy_set_signal_levels(struct intel_encoder *encoder,
+                                  const struct intel_crtc_state *crtc_state)
 {
-       u32 val;
-       enum dpio_phy phy;
+       struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+       int level = intel_ddi_level(encoder, crtc_state);
+       const struct intel_ddi_buf_trans *trans;
        enum dpio_channel ch;
+       enum dpio_phy phy;
+       int n_entries;
+       u32 val;
 
-       bxt_port_to_phy_channel(dev_priv, port, &phy, &ch);
+       trans = encoder->get_buf_trans(encoder, crtc_state, &n_entries);
+       if (drm_WARN_ON_ONCE(&dev_priv->drm, !trans))
+               return;
+       if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries))
+               level = n_entries - 1;
+
+       bxt_port_to_phy_channel(dev_priv, encoder->port, &phy, &ch);
 
        /*
         * While we write to the group register to program all lanes at once we
@@ -286,12 +297,13 @@ void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
 
        val = intel_de_read(dev_priv, BXT_PORT_TX_DW2_LN0(phy, ch));
        val &= ~(MARGIN_000 | UNIQ_TRANS_SCALE);
-       val |= margin << MARGIN_000_SHIFT | scale << UNIQ_TRANS_SCALE_SHIFT;
+       val |= trans->entries[level].bxt.margin << MARGIN_000_SHIFT |
+               trans->entries[level].bxt.scale << UNIQ_TRANS_SCALE_SHIFT;
        intel_de_write(dev_priv, BXT_PORT_TX_DW2_GRP(phy, ch), val);
 
        val = intel_de_read(dev_priv, BXT_PORT_TX_DW3_LN0(phy, ch));
        val &= ~SCALE_DCOMP_METHOD;
-       if (enable)
+       if (trans->entries[level].bxt.enable)
                val |= SCALE_DCOMP_METHOD;
 
        if ((val & UNIQUE_TRANGE_EN_METHOD) && !(val & SCALE_DCOMP_METHOD))
@@ -302,7 +314,7 @@ void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
 
        val = intel_de_read(dev_priv, BXT_PORT_TX_DW4_LN0(phy, ch));
        val &= ~DE_EMPHASIS;
-       val |= deemphasis << DEEMPH_SHIFT;
+       val |= trans->entries[level].bxt.deemphasis << DEEMPH_SHIFT;
        intel_de_write(dev_priv, BXT_PORT_TX_DW4_GRP(phy, ch), val);
 
        val = intel_de_read(dev_priv, BXT_PORT_PCS_DW10_LN01(phy, ch));

diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.h b/drivers/gpu/drm/i915/display/intel_dpio_phy.h
index 6473440..9c3d008 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpio_phy.h
+++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.h
@@ -17,9 +17,8 @@ struct intel_encoder;
 
 void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port,
                             enum dpio_phy *phy, enum dpio_channel *ch);
-void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
-                                 enum port port, u32 margin, u32 scale,
-                                 u32 enable, u32 deemphasis);
+void bxt_ddi_phy_set_signal_levels(struct intel_encoder *encoder,
+                                  const struct intel_crtc_state *crtc_state);
 void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy);
 void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy);
 bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,