Skip to content

Commit 038daf5

Browse files
committed
drm/i915/cnl: Fix PLL initialization for HDMI.
HDMI Mode selection on CNL is on CFGCR0 for that PLL, not on in a global CTRL1 as it was on SKL. The original patch addressed this difference, but leaving behind this single entry here. So we were checking the wrong bits during the PLL initialization and consequently avoiding the CFGCR1 setup during HDMI initialization. Luckly when only HDMI was in use BIOS had already setup this for us. But the dual display with hot plug were messed up. Fixes: a927c92 ("drm/i915/cnl: Initialize PLLs") Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Kahola, Mika <mika.kahola@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: James Ausmus <james.ausmus@intel.com> Reviewed-by: Manasi Navare <manasi.d.navare@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171003220859.21352-3-rodrigo.vivi@intel.com (cherry picked from commit 614ee07) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 41e64c1 commit 038daf5

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpu/drm/i915/intel_dpll_mgr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1996,7 +1996,7 @@ static void cnl_ddi_pll_enable(struct drm_i915_private *dev_priv,
19961996

19971997
/* 3. Configure DPLL_CFGCR0 */
19981998
/* Avoid touch CFGCR1 if HDMI mode is not enabled */
1999-
if (pll->state.hw_state.cfgcr0 & DPLL_CTRL1_HDMI_MODE(pll->id)) {
1999+
if (pll->state.hw_state.cfgcr0 & DPLL_CFGCR0_HDMI_MODE) {
20002000
val = pll->state.hw_state.cfgcr1;
20012001
I915_WRITE(CNL_DPLL_CFGCR1(pll->id), val);
20022002
/* 4. Reab back to ensure writes completed */

0 commit comments

Comments
 (0)