Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/icl: add pll mapping for DSI

Add encoder specific pll mapping for DSI. The differences with the DDI
version are big enough to warrant a separate function.

v2: add posting read (Madhav)

Cc: Madhav Chauhan <madhav.chauhan@intel.com>
Cc: Vandita Kulkarni <vandita.kulkarni@intel.com>
Reviewed-by: Madhav Chauhan <madhav.chauhan@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181203094326.28294-1-jani.nikula@intel.com

+25
+25
drivers/gpu/drm/i915/icl_dsi.c
··· 570 570 mutex_unlock(&dev_priv->dpll_lock); 571 571 } 572 572 573 + static void gen11_dsi_map_pll(struct intel_encoder *encoder, 574 + const struct intel_crtc_state *crtc_state) 575 + { 576 + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); 577 + struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 578 + struct intel_shared_dpll *pll = crtc_state->shared_dpll; 579 + enum port port; 580 + u32 val; 581 + 582 + mutex_lock(&dev_priv->dpll_lock); 583 + 584 + val = I915_READ(DPCLKA_CFGCR0_ICL); 585 + for_each_dsi_port(port, intel_dsi->ports) { 586 + val &= ~DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port); 587 + val |= DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, port); 588 + } 589 + I915_WRITE(DPCLKA_CFGCR0_ICL, val); 590 + POSTING_READ(DPCLKA_CFGCR0_ICL); 591 + 592 + mutex_unlock(&dev_priv->dpll_lock); 593 + } 594 + 573 595 static void 574 596 gen11_dsi_configure_transcoder(struct intel_encoder *encoder, 575 597 const struct intel_crtc_state *pipe_config) ··· 999 977 const struct drm_connector_state *conn_state) 1000 978 { 1001 979 struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base); 980 + 981 + /* step3b */ 982 + gen11_dsi_map_pll(encoder, pipe_config); 1002 983 1003 984 /* step4: enable DSI port and DPHY */ 1004 985 gen11_dsi_enable_port_and_phy(encoder, pipe_config);