On Mon, 22 Apr 2024, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > Our VLV_REF_DW13 is actually VLV_REF_DW11. Rename it.
I'll take your word for it. The patch does what the commit message says, Reviewed-by: Jani Nikula <[email protected]> > > Signed-off-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_dpll.c | 8 ++++---- > drivers/gpu/drm/i915/i915_reg.h | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c > b/drivers/gpu/drm/i915/display/intel_dpll.c > index 49274d632716..6693beafe9c0 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll.c > @@ -1880,19 +1880,19 @@ static void vlv_pllb_recal_opamp(struct > drm_i915_private *dev_priv, > reg_val |= 0x00000030; > vlv_dpio_write(dev_priv, phy, VLV_PLL_DW9(1), reg_val); > > - reg_val = vlv_dpio_read(dev_priv, phy, VLV_REF_DW13); > + reg_val = vlv_dpio_read(dev_priv, phy, VLV_REF_DW11); > reg_val &= 0x00ffffff; > reg_val |= 0x8c000000; > - vlv_dpio_write(dev_priv, phy, VLV_REF_DW13, reg_val); > + vlv_dpio_write(dev_priv, phy, VLV_REF_DW11, reg_val); > > reg_val = vlv_dpio_read(dev_priv, phy, VLV_PLL_DW9(1)); > reg_val &= 0xffffff00; > vlv_dpio_write(dev_priv, phy, VLV_PLL_DW9(1), reg_val); > > - reg_val = vlv_dpio_read(dev_priv, phy, VLV_REF_DW13); > + reg_val = vlv_dpio_read(dev_priv, phy, VLV_REF_DW11); > reg_val &= 0x00ffffff; > reg_val |= 0xb0000000; > - vlv_dpio_write(dev_priv, phy, VLV_REF_DW13, reg_val); > + vlv_dpio_write(dev_priv, phy, VLV_REF_DW11, reg_val); > } > > static void vlv_prepare_pll(const struct intel_crtc_state *crtc_state) > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 8eb6c2bf4557..a2fadcbe0932 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -246,8 +246,8 @@ > #define _VLV_PLL_DW11_CH1 0x806c > #define VLV_PLL_DW11(ch) _PIPE(ch, _VLV_PLL_DW11_CH0, _VLV_PLL_DW11_CH1) > > -/* Spec for ref block start counts at DW10 */ > -#define VLV_REF_DW13 0x80ac > +/* Spec for ref block start counts at DW8 */ > +#define VLV_REF_DW11 0x80ac > > #define VLV_CMN_DW0 0x8100 -- Jani Nikula, Intel
