drm/i915/icl: Calculate DPLL params for DSI (70a057b7) · Commits · 戴 / test

This patch calculates various DPLL dividers and parameters for DSI encoder and adjust AFE clock for DSI. For DSI, 8x clock is AFE clock. v2: Extend haswell_crtc_compute_clock() for Gen11 DSI v3: Rebase v4: use port clock instead of bitrate. v5: Reabse and remove divide by 5 v6 by Jani: - Fix indent (Madhav) - Fix dpll state calc for EDP and DP MST Co-developed-by:

Vandita Kulkarni <vandita.kulkarni@intel.com> Signed-off-by:

Madhav Chauhan <madhav.chauhan@intel.com> Signed-off-by:

Vandita Kulkarni <vandita.kulkarni@intel.com> Signed-off-by:

Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/525d41d0d893dcdc8874d2ce70afa226227ea3f4.1543500285.git.jani.nikula@intel.com

drivers/gpu/drm/i915/intel_display.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -9333,10 +9333,12 @@ void hsw_disable_pc8(struct drm_i915_private *dev_priv)
		static int haswell_crtc_compute_clock(struct intel_crtc *crtc,
		struct intel_crtc_state *crtc_state)
		{
		struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
		struct intel_atomic_state *state =
		to_intel_atomic_state(crtc_state->base.state);

		if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) {
		if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI) \|\|
		IS_ICELAKE(dev_priv)) {
		struct intel_encoder *encoder =
		intel_get_crtc_new_encoder(state, crtc_state);

drivers/gpu/drm/i915/intel_dpll_mgr.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2523,7 +2523,8 @@ static bool icl_calc_dpll_state(struct intel_crtc_state *crtc_state,

		if (intel_port_is_tc(dev_priv, encoder->port))
		ret = icl_calc_tbt_pll(dev_priv, clock, &pll_params);
		else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
		else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI) \|\|
		intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI))
		ret = cnl_ddi_calculate_wrpll(clock, dev_priv, &pll_params);
		else
		ret = icl_calc_dp_combo_pll(dev_priv, clock, &pll_params);

Admin message