drm/i915/dpio: Rename a few CHV DPIO PHY registers

Drop the leading underscore from the CHV PHY common lane
register definitions. We use these directly from actual
code so the underscore here is misleading as usually it indicates
an intermediate define that shouldn't be used directly.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240422083457.23815-12-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c
index e8a6e53fd551106e490a847c66b7750b3ae7ad80..49114afc9a61e0633b08225c50e19cdd6cc75c44 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
@@ -1442,9 +1442,9 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
        vlv_dpio_write(dev_priv, phy, CHV_CMN_DW28, tmp);
 
        if (id == VLV_DISP_PW_DPIO_CMN_BC) {
-               tmp = vlv_dpio_read(dev_priv, phy, _CHV_CMN_DW6_CH1);
+               tmp = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW6_CH1);
                tmp |= DPIO_DYNPWRDOWNEN_CH1;
-               vlv_dpio_write(dev_priv, phy, _CHV_CMN_DW6_CH1, tmp);
+               vlv_dpio_write(dev_priv, phy, CHV_CMN_DW6_CH1, tmp);
        } else {
                /*
                 * Force the non-existing CL2 off. BXT does this
@@ -1520,9 +1520,9 @@ static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpi
                return;
 
        if (ch == DPIO_CH0)
-               reg = _CHV_CMN_DW0_CH0;
+               reg = CHV_CMN_DW0_CH0;
        else
-               reg = _CHV_CMN_DW6_CH1;
+               reg = CHV_CMN_DW6_CH1;
 
        vlv_dpio_get(dev_priv);
        val = vlv_dpio_read(dev_priv, phy, reg);

diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
index 791902ba729c21b102aecb0bac23b4090437ee35..89a51b420075dc96b31ca522d556ab0b322e0eff 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpio_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
@@ -883,21 +883,21 @@ void chv_phy_pre_pll_enable(struct intel_encoder *encoder,
 
        /* program left/right clock distribution */
        if (pipe != PIPE_B) {
-               val = vlv_dpio_read(dev_priv, phy, _CHV_CMN_DW5_CH0);
+               val = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW5_CH0);
                val &= ~(CHV_BUFLEFTENA1_MASK | CHV_BUFRIGHTENA1_MASK);
                if (ch == DPIO_CH0)
                        val |= CHV_BUFLEFTENA1_FORCE;
                if (ch == DPIO_CH1)
                        val |= CHV_BUFRIGHTENA1_FORCE;
-               vlv_dpio_write(dev_priv, phy, _CHV_CMN_DW5_CH0, val);
+               vlv_dpio_write(dev_priv, phy, CHV_CMN_DW5_CH0, val);
        } else {
-               val = vlv_dpio_read(dev_priv, phy, _CHV_CMN_DW1_CH1);
+               val = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW1_CH1);
                val &= ~(CHV_BUFLEFTENA2_MASK | CHV_BUFRIGHTENA2_MASK);
                if (ch == DPIO_CH0)
                        val |= CHV_BUFLEFTENA2_FORCE;
                if (ch == DPIO_CH1)
                        val |= CHV_BUFRIGHTENA2_FORCE;
-               vlv_dpio_write(dev_priv, phy, _CHV_CMN_DW1_CH1, val);
+               vlv_dpio_write(dev_priv, phy, CHV_CMN_DW1_CH1, val);
        }
 
        /* program clock channel usage */
@@ -1036,13 +1036,13 @@ void chv_phy_post_pll_disable(struct intel_encoder *encoder,
 
        /* disable left/right clock distribution */
        if (pipe != PIPE_B) {
-               val = vlv_dpio_read(dev_priv, phy, _CHV_CMN_DW5_CH0);
+               val = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW5_CH0);
                val &= ~(CHV_BUFLEFTENA1_MASK | CHV_BUFRIGHTENA1_MASK);
-               vlv_dpio_write(dev_priv, phy, _CHV_CMN_DW5_CH0, val);
+               vlv_dpio_write(dev_priv, phy, CHV_CMN_DW5_CH0, val);
        } else {
-               val = vlv_dpio_read(dev_priv, phy, _CHV_CMN_DW1_CH1);
+               val = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW1_CH1);
                val &= ~(CHV_BUFLEFTENA2_MASK | CHV_BUFRIGHTENA2_MASK);
-               vlv_dpio_write(dev_priv, phy, _CHV_CMN_DW1_CH1, val);
+               vlv_dpio_write(dev_priv, phy, CHV_CMN_DW1_CH1, val);
        }
 
        vlv_dpio_put(dev_priv);

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 7891170c260cf774d7a5fe6860d37d23da5848e1..adbe124d10bd54654cb8256b4fb22ddd191940ed 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -459,13 +459,13 @@
 #define  DPIO_CHV_INT_LOCK_THRESHOLD_SEL_COARSE        1 /* 1: coarse & 0 : fine  */
 #define CHV_PLL_DW9(ch) _PIPE(ch, _CHV_PLL_DW9_CH0, _CHV_PLL_DW9_CH1)
 
-#define _CHV_CMN_DW0_CH0               0x8100
+#define CHV_CMN_DW0_CH0                        0x8100
 #define   DPIO_ALLDL_POWERDOWN_SHIFT_CH0       19
 #define   DPIO_ANYDL_POWERDOWN_SHIFT_CH0       18
 #define   DPIO_ALLDL_POWERDOWN                 (1 << 1)
 #define   DPIO_ANYDL_POWERDOWN                 (1 << 0)
 
-#define _CHV_CMN_DW5_CH0               0x8114
+#define CHV_CMN_DW5_CH0                        0x8114
 #define   CHV_BUFRIGHTENA1_DISABLE     (0 << 20)
 #define   CHV_BUFRIGHTENA1_NORMAL      (1 << 20)
 #define   CHV_BUFRIGHTENA1_FORCE       (3 << 20)
@@ -475,18 +475,18 @@
 #define   CHV_BUFLEFTENA1_FORCE                (3 << 22)
 #define   CHV_BUFLEFTENA1_MASK         (3 << 22)
 
-#define _CHV_CMN_DW13_CH0              0x8134
-#define _CHV_CMN_DW0_CH1               0x8080
+#define CHV_CMN_DW13_CH0               0x8134
+#define CHV_CMN_DW0_CH1                        0x8080
 #define   DPIO_CHV_S1_DIV_SHIFT                21
 #define   DPIO_CHV_P1_DIV_SHIFT                13 /* 3 bits */
 #define   DPIO_CHV_P2_DIV_SHIFT                8  /* 5 bits */
 #define   DPIO_CHV_K_DIV_SHIFT         4
 #define   DPIO_PLL_FREQLOCK            (1 << 1)
 #define   DPIO_PLL_LOCK                        (1 << 0)
-#define CHV_CMN_DW13(ch) _PIPE(ch, _CHV_CMN_DW13_CH0, _CHV_CMN_DW0_CH1)
+#define CHV_CMN_DW13(ch) _PIPE(ch, CHV_CMN_DW13_CH0, CHV_CMN_DW0_CH1)
 
-#define _CHV_CMN_DW14_CH0              0x8138
-#define _CHV_CMN_DW1_CH1               0x8084
+#define CHV_CMN_DW14_CH0               0x8138
+#define CHV_CMN_DW1_CH1                        0x8084
 #define   DPIO_AFC_RECAL               (1 << 14)
 #define   DPIO_DCLKP_EN                        (1 << 13)
 #define   CHV_BUFLEFTENA2_DISABLE      (0 << 17) /* CL2 DW1 only */
@@ -497,16 +497,15 @@
 #define   CHV_BUFRIGHTENA2_NORMAL      (1 << 19) /* CL2 DW1 only */
 #define   CHV_BUFRIGHTENA2_FORCE       (3 << 19) /* CL2 DW1 only */
 #define   CHV_BUFRIGHTENA2_MASK                (3 << 19) /* CL2 DW1 only */
-#define CHV_CMN_DW14(ch) _PIPE(ch, _CHV_CMN_DW14_CH0, _CHV_CMN_DW1_CH1)
+#define CHV_CMN_DW14(ch) _PIPE(ch, CHV_CMN_DW14_CH0, CHV_CMN_DW1_CH1)
 
-#define _CHV_CMN_DW19_CH0              0x814c
-#define _CHV_CMN_DW6_CH1               0x8098
+#define CHV_CMN_DW19_CH0               0x814c
+#define CHV_CMN_DW6_CH1                0x8098
 #define   DPIO_ALLDL_POWERDOWN_SHIFT_CH1       30 /* CL2 DW6 only */
 #define   DPIO_ANYDL_POWERDOWN_SHIFT_CH1       29 /* CL2 DW6 only */
 #define   DPIO_DYNPWRDOWNEN_CH1                (1 << 28) /* CL2 DW6 only */
 #define   CHV_CMN_USEDCLKCHANNEL       (1 << 13)
-
-#define CHV_CMN_DW19(ch) _PIPE(ch, _CHV_CMN_DW19_CH0, _CHV_CMN_DW6_CH1)
+#define CHV_CMN_DW19(ch) _PIPE(ch, CHV_CMN_DW19_CH0, CHV_CMN_DW6_CH1)
 
 #define CHV_CMN_DW28                   0x8170
 #define   DPIO_CL1POWERDOWNEN          (1 << 23)