---

yaml --- r: 288083 b: refs/heads/master c: c0e2ee1 h: refs/heads/master i: 288081: 3283977 288079: acb1046 v: v3
git-mirror · Feb 24, 2012 · 34f9509 · 34f9509
1 parent 43d2d5f
commit 34f9509
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e9bb47bd29e02f2daaa7bdb2a8ddf977bf76f06
+refs/heads/master: c0e2ee1bc0cf82eec89e26b7afe7e4db0561b7d9
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -8194,7 +8194,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)
 
 	if (intel_enable_rc6(dev_priv->dev))
 		rc6_mask = GEN6_RC_CTL_RC6_ENABLE |
-			(IS_GEN7(dev_priv->dev)) ? GEN6_RC_CTL_RC6p_ENABLE : 0;
+			((IS_GEN7(dev_priv->dev)) ? GEN6_RC_CTL_RC6p_ENABLE : 0);
 
 	I915_WRITE(GEN6_RC_CONTROL,
 		   rc6_mask |