[Intel-gfx] [PATCH v7 2/5] drm/i915/rkl: Add DPLL4 support

Lucas De Marchi lucas.demarchi at intel.com
Wed Jun 17 18:22:58 UTC 2020


On Tue, Jun 16, 2020 at 08:30:57PM -0700, Matt Roper wrote:
>Rocket Lake has a third DPLL (called 'DPLL4') that must be used to
>enable a third display.  Unlike EHL's variant of DPLL4, the RKL variant
>behaves the same as DPLL0/1.  And despite its name, the DPLL4 registers
>are offset as if it were DPLL2.
>
>To allow the TGL register selectors like TGL_DPLL_CFGCR0 to be used
>seamlessly on all gen12 platforms, we set the non-MG PLL ID's to match
>how the registers are laid out: DPLL0, DPLL1, DPLL4 (RKL-only), TBT.
>This means just renumbering TBT to be ID '3' rather than being another
>ID '2' like DPLL4.  With this change, we can build our register
>selectors with _MMIO_PLL rather than _MMIO_PLL3 since the register
>offsets are evenly-spaced.  MGPLL's don't need any specific ID's
>(they're just used to translate back to a tc_port), so we let them float
>at the top of the enum.
>
>v2:
> - Add new .update_ref_clks() hook.
>
>v3:
> - Renumber TBT PLL to '3' and switch _MMIO_PLL3 to _MMIO_PLL (Lucas)
>
>Bspec: 49202
>Bspec: 49443
>Bspec: 50288
>Bspec: 50289
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
>---
> drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 29 +++++++++++++++++--
> drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 14 ++++-----
> drivers/gpu/drm/i915/i915_reg.h               | 15 +++-------
> 3 files changed, 37 insertions(+), 21 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
>index b45185b80bec..b5f4d4cef682 100644
>--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
>+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
>@@ -3506,13 +3506,19 @@ static bool icl_get_combo_phy_dpll(struct intel_atomic_state *state,
> 		return false;
> 	}
>
>-	if (IS_ELKHARTLAKE(dev_priv) && port != PORT_A)
>+	if (IS_ROCKETLAKE(dev_priv)) {
> 		dpll_mask =
> 			BIT(DPLL_ID_EHL_DPLL4) |
> 			BIT(DPLL_ID_ICL_DPLL1) |
> 			BIT(DPLL_ID_ICL_DPLL0);
>-	else
>+	} else if (IS_ELKHARTLAKE(dev_priv) && port != PORT_A) {
>+		dpll_mask =
>+			BIT(DPLL_ID_EHL_DPLL4) |
>+			BIT(DPLL_ID_ICL_DPLL1) |
>+			BIT(DPLL_ID_ICL_DPLL0);
>+	} else {
> 		dpll_mask = BIT(DPLL_ID_ICL_DPLL1) | BIT(DPLL_ID_ICL_DPLL0);
>+	}
>
> 	port_dpll->pll = intel_find_shared_dpll(state, crtc,
> 						&port_dpll->hw_state,
>@@ -4275,6 +4281,21 @@ static const struct intel_dpll_mgr tgl_pll_mgr = {
> 	.dump_hw_state = icl_dump_hw_state,
> };
>
>+static const struct dpll_info rkl_plls[] = {
>+	{ "DPLL 0", &combo_pll_funcs, DPLL_ID_ICL_DPLL0, 0 },
>+	{ "DPLL 1", &combo_pll_funcs, DPLL_ID_ICL_DPLL1, 0 },
>+	{ "DPLL 4", &combo_pll_funcs, DPLL_ID_EHL_DPLL4, 0 },
>+	{ },
>+};
>+
>+static const struct intel_dpll_mgr rkl_pll_mgr = {
>+	.dpll_info = rkl_plls,
>+	.get_dplls = icl_get_dplls,
>+	.put_dplls = icl_put_dplls,
>+	.update_ref_clks = icl_update_dpll_ref_clks,
>+	.dump_hw_state = icl_dump_hw_state,
>+};
>+
> /**
>  * intel_shared_dpll_init - Initialize shared DPLLs
>  * @dev: drm device
>@@ -4288,7 +4309,9 @@ void intel_shared_dpll_init(struct drm_device *dev)
> 	const struct dpll_info *dpll_info;
> 	int i;
>
>-	if (INTEL_GEN(dev_priv) >= 12)
>+	if (IS_ROCKETLAKE(dev_priv))
>+		dpll_mgr = &rkl_pll_mgr;
>+	else if (INTEL_GEN(dev_priv) >= 12)
> 		dpll_mgr = &tgl_pll_mgr;
> 	else if (IS_ELKHARTLAKE(dev_priv))
> 		dpll_mgr = &ehl_pll_mgr;
>diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
>index 5d9a2bc371e7..49367847bfb5 100644
>--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
>+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
>@@ -125,35 +125,35 @@ enum intel_dpll_id {
> 	/**
> 	 * @DPLL_ID_ICL_TBTPLL: ICL/TGL TBT PLL
> 	 */
>-	DPLL_ID_ICL_TBTPLL = 2,
>+	DPLL_ID_ICL_TBTPLL = 3,
> 	/**
> 	 * @DPLL_ID_ICL_MGPLL1: ICL MG PLL 1 port 1 (C),
> 	 *                      TGL TC PLL 1 port 1 (TC1)
> 	 */
>-	DPLL_ID_ICL_MGPLL1 = 3,
>+	DPLL_ID_ICL_MGPLL1,
> 	/**
> 	 * @DPLL_ID_ICL_MGPLL2: ICL MG PLL 1 port 2 (D)
> 	 *                      TGL TC PLL 1 port 2 (TC2)
> 	 */
>-	DPLL_ID_ICL_MGPLL2 = 4,
>+	DPLL_ID_ICL_MGPLL2,
> 	/**
> 	 * @DPLL_ID_ICL_MGPLL3: ICL MG PLL 1 port 3 (E)
> 	 *                      TGL TC PLL 1 port 3 (TC3)
> 	 */
>-	DPLL_ID_ICL_MGPLL3 = 5,
>+	DPLL_ID_ICL_MGPLL3,
> 	/**
> 	 * @DPLL_ID_ICL_MGPLL4: ICL MG PLL 1 port 4 (F)
> 	 *                      TGL TC PLL 1 port 4 (TC4)
> 	 */
>-	DPLL_ID_ICL_MGPLL4 = 6,
>+	DPLL_ID_ICL_MGPLL4,
> 	/**
> 	 * @DPLL_ID_TGL_MGPLL5: TGL TC PLL port 5 (TC5)
> 	 */
>-	DPLL_ID_TGL_MGPLL5 = 7,
>+	DPLL_ID_TGL_MGPLL5,
> 	/**
> 	 * @DPLL_ID_TGL_MGPLL6: TGL TC PLL port 6 (TC6)
> 	 */
>-	DPLL_ID_TGL_MGPLL6 = 8,
>+	DPLL_ID_TGL_MGPLL6,
> };
>
> #define I915_NUM_PLLS 9
>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>index 45bda5819abd..34f8698ac3aa 100644
>--- a/drivers/gpu/drm/i915/i915_reg.h
>+++ b/drivers/gpu/drm/i915/i915_reg.h
>@@ -242,7 +242,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
> #define _MMIO_PIPE3(pipe, a, b, c)	_MMIO(_PICK(pipe, a, b, c))
> #define _MMIO_PORT3(pipe, a, b, c)	_MMIO(_PICK(pipe, a, b, c))
> #define _MMIO_PHY3(phy, a, b, c)	_MMIO(_PHY3(phy, a, b, c))
>-#define _MMIO_PLL3(pll, a, b, c)	_MMIO(_PICK(pll, a, b, c))

See my series adding DPLL support for DG1. We will need it again for a
different reason, with a slightly different form. I'd let this here
to avoid removing and adding it back.

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

thanks
Lucas De Marchi

>
> /*
>  * Device info offset array based helpers for groups of registers with unevenly
>@@ -10427,19 +10426,13 @@ enum skl_power_gate {
>
> #define _TGL_DPLL0_CFGCR0		0x164284
> #define _TGL_DPLL1_CFGCR0		0x16428C
>-/* TODO: add DPLL4 */
>-#define _TGL_TBTPLL_CFGCR0		0x16429C
>-#define TGL_DPLL_CFGCR0(pll)		_MMIO_PLL3(pll, _TGL_DPLL0_CFGCR0, \
>-						  _TGL_DPLL1_CFGCR0, \
>-						  _TGL_TBTPLL_CFGCR0)
>+#define TGL_DPLL_CFGCR0(pll)		_MMIO_PLL(pll, _TGL_DPLL0_CFGCR0, \
>+						  _TGL_DPLL1_CFGCR0)
>
> #define _TGL_DPLL0_CFGCR1		0x164288
> #define _TGL_DPLL1_CFGCR1		0x164290
>-/* TODO: add DPLL4 */
>-#define _TGL_TBTPLL_CFGCR1		0x1642A0
>-#define TGL_DPLL_CFGCR1(pll)		_MMIO_PLL3(pll, _TGL_DPLL0_CFGCR1, \
>-						   _TGL_DPLL1_CFGCR1, \
>-						   _TGL_TBTPLL_CFGCR1)
>+#define TGL_DPLL_CFGCR1(pll)		_MMIO_PLL(pll, _TGL_DPLL0_CFGCR1, \
>+						  _TGL_DPLL1_CFGCR1)
>
> #define _DKL_PHY1_BASE			0x168000
> #define _DKL_PHY2_BASE			0x169000
>-- 
>2.24.1
>


More information about the Intel-gfx mailing list