Attachment 82476 Details for Bug 66952 – sanitize shared dpll state

[patch] sanitize shared dpll state

0001-drm-i915-Sanitize-shared-dpll-state.patch (text/plain), 1.93 KB, created by Daniel Vetter on 2013-07-16 10:52:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2013-07-16 10:52:54 UTC

Size: 1.93 KB

patch

obsolete

>From 62ddfb8b24348809c12b70187a893487397ae5d8 Mon Sep 17 00:00:00 2001
>From: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date: Tue, 16 Jul 2013 12:50:50 +0200
>Subject: [PATCH] drm/i915: Sanitize shared dpll state
>
>There seems to be no limit to the amount of gunk the firmware can
>leave behind. Some platforms leave pch dplls on which are not in
>active use at all.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66952
>Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 3cda57d..3c35c55 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -9958,8 +9958,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
> 		}
> 		pll->refcount = pll->active;
> 
>-		DRM_DEBUG_KMS("%s hw state readout: refcount %i\n",
>-			      pll->name, pll->refcount);
>+		DRM_DEBUG_KMS("%s hw state readout: refcount %i, on %i\n",
>+			      pll->name, pll->refcount, pll->on);
> 	}
> 
> 	list_for_each_entry(encoder, &dev->mode_config.encoder_list,
>@@ -10019,6 +10019,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
> 	struct drm_plane *plane;
> 	struct intel_crtc *crtc;
> 	struct intel_encoder *encoder;
>+	int i;
> 
> 	intel_modeset_readout_hw_state(dev);
> 
>@@ -10050,6 +10051,18 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
> 		intel_dump_pipe_config(crtc, &crtc->config, "[setup_hw_state]");
> 	}
> 
>+	for (i = 0; i < dev_priv->num_shared_dpll; i++) {
>+		struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i];
>+
>+		if (!pll->on || pll->active)
>+			continue;
>+
>+		DRM_DEBUG_KMS("%s enabled but not in use, disabling\n", pll->name);
>+
>+		pll->disable(dev_priv, pll);
>+		pll->on = false;
>+	}
>+
> 	if (force_restore) {
> 		/*
> 		 * We need to use raw interfaces for restoring state to avoid
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 66952: 82471 | 82473 | 82476 | 82516

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.