From 34f950972276b2505234617801c9bdf4603fba3f Mon Sep 17 00:00:00 2001 From: Eugeni Dodonov Date: Thu, 23 Feb 2012 23:57:06 -0200 Subject: [PATCH] --- yaml --- r: 288083 b: refs/heads/master c: c0e2ee1bc0cf82eec89e26b7afe7e4db0561b7d9 h: refs/heads/master i: 288081: 32839773d54cec106105be258404c58c36578bec 288079: acb10460f8401a688a2b3925b039bbc7ef853c73 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e93dbd078e23..656d5ea938c7 100644 --- 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 index e654f32de197..4871ba0dcc14 100644 --- 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 |