Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acbec814 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915/vlv: add VLV specific clock_get function v3 

Calculation is a little different than other platforms.

v2: update to use port_clock instead
    rebase on top of Ville's changes
v3: update to new port_clock semantics - don't divide by
    pixel_multiplier (Ville)

References: https://bugs.freedesktop.org/show_bug.cgi?id=67345


Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b52b89da

drivers/gpu/drm/i915/intel_display.c

+32 −1
Original line number Diff line number Diff line
@@ -5076,6 +5076,34 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc, 
			I915_READ(LVDS) & LVDS_BORDER_ENABLE;

}



static void vlv_crtc_clock_get(struct intel_crtc *crtc,

			       struct intel_crtc_config *pipe_config)

{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	int pipe = pipe_config->cpu_transcoder;

	intel_clock_t clock;

	u32 mdiv;

	int refclk = 100000, fastclk, update_rate;



	mutex_lock(&dev_priv->dpio_lock);

	mdiv = vlv_dpio_read(dev_priv, pipe, DPIO_DIV(pipe));

	mutex_unlock(&dev_priv->dpio_lock);



	clock.m1 = (mdiv >> DPIO_M1DIV_SHIFT) & 7;

	clock.m2 = mdiv & DPIO_M2DIV_MASK;

	clock.n = (mdiv >> DPIO_N_SHIFT) & 0xf;

	clock.p1 = (mdiv >> DPIO_P1_SHIFT) & 7;

	clock.p2 = (mdiv >> DPIO_P2_SHIFT) & 0x1f;



	update_rate = refclk / clock.n;

	clock.vco = update_rate * clock.m1 * clock.m2;

	fastclk = clock.vco / clock.p1 / clock.p2;

	clock.dot = (2 * fastclk);



	pipe_config->port_clock = clock.dot / 10;

}



static bool i9xx_get_pipe_config(struct intel_crtc *crtc,

				 struct intel_crtc_config *pipe_config)

{
@@ -5141,6 +5169,9 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc, 
						     DPLL_PORTB_READY_MASK);

	}



	if (IS_VALLEYVIEW(dev))

		vlv_crtc_clock_get(crtc, pipe_config);

	else

		i9xx_crtc_clock_get(crtc, pipe_config);



	return true;