Commit b1c560d1 authored Dec 09, 2013 by Ville Syrjälä Committed by Daniel Vetter Dec 11, 2013

drm/i915: Extract p2 divider correctly for gen2 LVDS dual channel



In order to determine the correct p2 divider for LVDS on gen2,
we need to check the CLKB mode from the LVDS port register to
determine if we're dealing with single or dual channel LVDS.

Cc: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 3dda20a9

drivers/gpu/drm/i915/intel_display.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -7951,11 +7951,16 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
		else
		i9xx_clock(refclk, &clock);
		} else {
		bool is_lvds = (pipe == 1) && (I915_READ(LVDS) & LVDS_PORT_EN);
		u32 lvds = I915_READ(LVDS);
		bool is_lvds = (pipe == 1) && (lvds & LVDS_PORT_EN);

		if (is_lvds) {
		clock.p1 = ffs((dpll & DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS) >>
		DPLL_FPA01_P1_POST_DIV_SHIFT);

		if (lvds & LVDS_CLKB_POWER_UP)
		clock.p2 = 7;
		else
		clock.p2 = 14;
		} else {
		if (dpll & PLL_P1_DIVIDE_BY_TWO)

Admin message