Attachment 82733 Details for Bug 67122 – Clear forcewake before use

[patch] Clear forcewake before use

0001-drm-i915-Clear-forcewake-before-use.patch (text/plain), 2.33 KB, created by Chris Wilson on 2013-07-20 16:22:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-07-20 16:22:31 UTC

Size: 2.33 KB

patch

obsolete

>From 3b0ce36475ef80eb1e22b353102336d56eba49cb Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Sat, 20 Jul 2013 17:15:54 +0100
>Subject: [PATCH] drm/i915: Clear forcewake before use
>
>commit 7dcd2677ea912573d9ed4bcd629b0023b2d11505
>Author: Konstantin Khlebnikov <khlebnikov@openvz.org>
>Date:   Wed Jul 17 10:22:58 2013 +0400
>
>    drm/i915: fix long-standing SNB regression in power consumption after resume
>
>reintroduces the
>[drm:__gen6_gt_force_wake_mt_get] *ERROR* Timed out waiting for forcewake old ack to clear."
>error upon boot. So restore the forcewake clearing before we depend upon
>it.
>
>Bugzlla: https://bugs.freedesktop.org/show_bug.cgi?id=67122
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_uncore.c | 24 +++++++++++++++---------
> 1 file changed, 15 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
>index b2703db..57df6e4 100644
>--- a/drivers/gpu/drm/i915/intel_uncore.c
>+++ b/drivers/gpu/drm/i915/intel_uncore.c
>@@ -204,10 +204,24 @@ static void vlv_force_wake_put(struct drm_i915_private *dev_priv)
> 	gen6_gt_check_fifodbg(dev_priv);
> }
> 
>+static void intel_uncore_clear_forcewake(struct drm_device *dev)
>+{
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+
>+	if (IS_VALLEYVIEW(dev)) {
>+		vlv_force_wake_reset(dev_priv);
>+	} else if (INTEL_INFO(dev)->gen >= 6) {
>+		__gen6_gt_force_wake_reset(dev_priv);
>+		if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
>+			__gen6_gt_force_wake_mt_reset(dev_priv);
>+	}
>+}
>+
> void intel_uncore_early_sanitize(struct drm_device *dev)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 
>+	intel_uncore_clear_forcewake(dev);
> 	if (HAS_FPGA_DBG_UNCLAIMED(dev))
> 		__raw_i915_write32(dev_priv, FPGA_DBG, FPGA_DBG_RM_NOCLAIM);
> }
>@@ -265,15 +279,7 @@ void intel_uncore_init(struct drm_device *dev)
> 
> void intel_uncore_reset(struct drm_device *dev)
> {
>-	struct drm_i915_private *dev_priv = dev->dev_private;
>-
>-	if (IS_VALLEYVIEW(dev)) {
>-		vlv_force_wake_reset(dev_priv);
>-	} else if (INTEL_INFO(dev)->gen >= 6) {
>-		__gen6_gt_force_wake_reset(dev_priv);
>-		if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
>-			__gen6_gt_force_wake_mt_reset(dev_priv);
>-	}
>+	intel_uncore_clear_forcewake(dev);
> 
> 	/* BIOS often leaves RC6 enabled, but disable it for hw init */
> 	intel_disable_gt_powersave(dev);
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 67122: 82733 | 82772

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.