Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 442aa277 authored by Manasi Navare's avatar Manasi Navare Committed by Rodrigo Vivi
Browse files

drm/i915/cnl: Change the macro name to DPLL_CFGCR0_DCO_FRACTION_SHIFT 



No functional changes. Only change the macro from
"DPLL_CFGCR0_DC0_FRAC_SHIFT to DPLL_CFGCR0_DCO_FRACTION_SHIFT
to be consistent with DPLL_CFGCR0_DCO_FRACTION_MASK
and DPLL_CFGCR0_DCO_FRACTION

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1505413899-30876-1-git-send-email-manasi.d.navare@intel.com
parent 5190707e

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -8599,7 +8599,7 @@ enum skl_power_gate { 
#define  DPLL_CFGCR0_LINK_RATE_3240	(6 << 25)

#define  DPLL_CFGCR0_LINK_RATE_4050	(7 << 25)

#define  DPLL_CFGCR0_DCO_FRACTION_MASK	(0x7fff << 10)

#define  DPLL_CFGCR0_DCO_FRAC_SHIFT	(10)

#define  DPLL_CFGCR0_DCO_FRACTION_SHIFT	(10)

#define  DPLL_CFGCR0_DCO_FRACTION(x)	((x) << 10)

#define  DPLL_CFGCR0_DCO_INTEGER_MASK	(0x3ff)

#define CNL_DPLL_CFGCR0(pll)		_MMIO_PLL(pll, _CNL_DPLL0_CFGCR0, _CNL_DPLL1_CFGCR0)

drivers/gpu/drm/i915/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ static int cnl_calc_wrpll_link(struct drm_i915_private *dev_priv, 
	dco_freq = (cfgcr0 & DPLL_CFGCR0_DCO_INTEGER_MASK) * ref_clock;



	dco_freq += (((cfgcr0 & DPLL_CFGCR0_DCO_FRACTION_MASK) >>

		      DPLL_CFGCR0_DCO_FRAC_SHIFT) * ref_clock) / 0x8000;

		      DPLL_CFGCR0_DCO_FRACTION_SHIFT) * ref_clock) / 0x8000;



	return dco_freq / (p0 * p1 * p2 * 5);

}