From: Eugeni Dodonov Date: Fri, 24 Feb 2012 01:57:06 +0000 (-0200) Subject: drm/i915: fix operator precedence when enabling RC6p X-Git-Tag: v3.3-rc6~19^2~4^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0e2ee1bc0cf82eec89e26b7afe7e4db0561b7d9;p=platform%2Fupstream%2Fkernel-adaptation-pc.git drm/i915: fix operator precedence when enabling RC6p As noticed by Torsten Kaiser, the operator precedence can play tricks with us here. CC: Dave Airlie Signed-off-by: Eugeni Dodonov Signed-off-by: Jesse Barnes --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e654f32..4871ba0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/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 |