Attachment 86104 Details for Bug 67345 – wip vlv clock get patch

wip vlv clock get patch

i915-vlv-clock-get.patch (text/plain), 1.96 KB, created by Jesse Barnes on 2013-09-18 20:39:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2013-09-18 20:39:55 UTC

Size: 1.96 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 1d14ad3..4e4a46b 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -7257,6 +7257,35 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
> 	mutex_unlock(&crtc->mutex);
> }
> 
>+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 = vlv_get_refclk(&crtc->base), 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->pixel_multiplier ?
>+				     pipe_config->pixel_multiplier : 1);
>+
>+	pipe_config->adjusted_mode.clock = clock.dot;
>+}
>+
> /* Returns the clock of the currently programmed mode of the given pipe. */
> static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
> 				struct intel_crtc_config *pipe_config)
>@@ -9826,7 +9855,7 @@ static void intel_init_display(struct drm_device *dev)
> 		dev_priv->display.update_plane = ironlake_update_plane;
> 	} else if (IS_VALLEYVIEW(dev)) {
> 		dev_priv->display.get_pipe_config = i9xx_get_pipe_config;
>-		dev_priv->display.get_clock = i9xx_crtc_clock_get;
>+		dev_priv->display.get_clock = vlv_crtc_clock_get;
> 		dev_priv->display.crtc_mode_set = i9xx_crtc_mode_set;
> 		dev_priv->display.crtc_enable = valleyview_crtc_enable;
> 		dev_priv->display.crtc_disable = i9xx_crtc_disable;

Actions: View

Attachments on bug 67345: 83027 | 83120 | 83121 | 85894 | 86104 | 86335

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.