Skip to content

Commit 41e64c1

Browse files
committed
drm/i915/cnl: Fix PLL mapping.
On PLL Enable sequence we need to "Configure DPCLKA_CFGCR0 to turn on the clock for the DDI and map the DPLL to the DDI" So we first do the map and then we unset DDI_CLK_OFF to turn the clock on. We do this in 2 separated steps. However, on this second step where we should only unset the off bit we are also unmapping the ddi from the pll. So we end up using the pll 0 for almost everything. Consequently breaking cases with more than one display. Fixes: 555e38d ("drm/i915/cnl: DDI - PLL mapping") 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> Link: https://patchwork.freedesktop.org/patch/msgid/20171003220859.21352-2-rodrigo.vivi@intel.com (cherry picked from commit 87145d9) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent fbe776c commit 41e64c1

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/gpu/drm/i915/intel_ddi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2102,8 +2102,7 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder,
21022102
* register writes.
21032103
*/
21042104
val = I915_READ(DPCLKA_CFGCR0);
2105-
val &= ~(DPCLKA_CFGCR0_DDI_CLK_OFF(port) |
2106-
DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port));
2105+
val &= ~DPCLKA_CFGCR0_DDI_CLK_OFF(port);
21072106
I915_WRITE(DPCLKA_CFGCR0, val);
21082107
} else if (IS_GEN9_BC(dev_priv)) {
21092108
/* DDI -> PLL mapping */

0 commit comments

Comments
 (0)