From: Deepak S <deepak.s@intel.com>
Date: Mon, 18 Aug 2014 17:35:27 +0000 (-0700)
Subject: drm/i915: Bring UP Power Wells before disabling RC6.
X-Git-Tag: v3.18-rc1~44^2~32^2~98
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=98a2e5f94275b6aafb12a3650937f6c54222cdc2;p=karo-tx-linux.git

drm/i915: Bring UP Power Wells before disabling RC6.

We need do forcewake before Disabling RC6, This is what the BIOS
expects while going into suspend.

v2: updated commit message. (Daniel)

Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Deepak S <deepak.s@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index b1b3a6b892c6..a381c9997a25 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3533,8 +3533,14 @@ static void valleyview_disable_rps(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
+	/* we're doing forcewake before Disabling RC6,
+	 * This what the BIOS expects when going into suspend */
+	gen6_gt_force_wake_get(dev_priv, FORCEWAKE_ALL);
+
 	I915_WRITE(GEN6_RC_CONTROL, 0);
 
+	gen6_gt_force_wake_put(dev_priv, FORCEWAKE_ALL);
+
 	gen6_disable_rps_interrupts(dev);
 }