Attachment 91615 Details for Bug 64379 – Fix candidate

[patch] Fix candidate

0001-drm-i915-fix-DDI-PLLs-HW-state-readout-code.patch (text/plain), 1.41 KB, created by Paulo Zanoni on 2014-01-07 21:10:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Zanoni

Created: 2014-01-07 21:10:38 UTC

Size: 1.41 KB

patch

obsolete

>From 1b24462be8a5999919f27b123389abc40fe178cd Mon Sep 17 00:00:00 2001
>From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>Date: Tue, 7 Jan 2014 18:52:34 -0200
>Subject: [PATCH 1/2] drm/i915: fix DDI PLLs HW state readout code
>
>Properly zero the refcounts and crtc->ddi_pll_set so the previous HW
>state doesn't affect the result of reading the current HW state.
>
>This fixes WARNs about WRPLL refcount if we have an HDMI monitor on
>HSW and then suspend/resume.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64379
>Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
>---
> drivers/gpu/drm/i915/intel_ddi.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
>index 4ec1665..0def5ef 100644
>--- a/drivers/gpu/drm/i915/intel_ddi.c
>+++ b/drivers/gpu/drm/i915/intel_ddi.c
>@@ -1136,12 +1136,18 @@ void intel_ddi_setup_hw_pll_state(struct drm_device *dev)
> 	enum pipe pipe;
> 	struct intel_crtc *intel_crtc;
> 
>+	dev_priv->ddi_plls.spll_refcount = 0;
>+	dev_priv->ddi_plls.wrpll1_refcount = 0;
>+	dev_priv->ddi_plls.wrpll2_refcount = 0;
>+
> 	for_each_pipe(pipe) {
> 		intel_crtc =
> 			to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);
> 
>-		if (!intel_crtc->active)
>+		if (!intel_crtc->active) {
>+			intel_crtc->ddi_pll_sel = PORT_CLK_SEL_NONE;
> 			continue;
>+		}
> 
> 		intel_crtc->ddi_pll_sel = intel_ddi_get_crtc_pll(dev_priv,
> 								 pipe);
>-- 
>1.8.4.2
>

Actions: View | Splinter Review

Attachments on bug 64379: 79040 | 80374 | 83953 | 91615 | 91638

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.