---

yaml --- r: 318646 b: refs/heads/master c: 8850948 h: refs/heads/master v: v3
git-mirror · Jul 5, 2012 · ea7183b · ea7183b
1 parent 2462899
commit ea7183b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a637c2c83a26f496688a28e629a3c0acb8a7be5
+refs/heads/master: 885094845067dd3791b0f6c3497d51bca76e393a
diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c
@@ -2305,6 +2305,7 @@ static void gen6_disable_rps(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
+	I915_WRITE(GEN6_RC_CONTROL, 0);
 	I915_WRITE(GEN6_RPNSWREQ, 1 << 31);
 	I915_WRITE(GEN6_PMINTRMSK, 0xffffffff);
 	I915_WRITE(GEN6_PMIER, 0);