From 30fd0815f12dbbb713e65def5423f2d489649a60 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 8 Sep 2011 14:00:21 +0200 Subject: [PATCH] --- yaml --- r: 269821 b: refs/heads/master c: a9e2641dee52cae2db7688a749344365642a5e79 h: refs/heads/master i: 269819: 0d1f87604b94a9686694c879333cbcce66b2ca32 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3732529b9ac1..f639eb6d93bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fb066ab9ef3111c86d9fb8f13f1178885cf7f1c +refs/heads/master: a9e2641dee52cae2db7688a749344365642a5e79 diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c index 98eedddc7440..9ee2729fe5c6 100644 --- a/trunk/drivers/gpu/drm/i915/i915_irq.c +++ b/trunk/drivers/gpu/drm/i915/i915_irq.c @@ -383,6 +383,7 @@ static void gen6_pm_rps_work(struct work_struct *work) pm_iir = dev_priv->pm_iir; dev_priv->pm_iir = 0; pm_imr = I915_READ(GEN6_PMIMR); + I915_WRITE(GEN6_PMIMR, 0); spin_unlock_irq(&dev_priv->rps_lock); if (!pm_iir) @@ -420,7 +421,6 @@ static void gen6_pm_rps_work(struct work_struct *work) * an *extremely* unlikely race with gen6_rps_enable() that is prevented * by holding struct_mutex for the duration of the write. */ - I915_WRITE(GEN6_PMIMR, pm_imr & ~pm_iir); mutex_unlock(&dev_priv->dev->struct_mutex); }