aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 98eedddc7440..9ee2729fe5c6 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -383,6 +383,7 @@ static void gen6_pm_rps_work(struct work_struct *work)
383 pm_iir = dev_priv->pm_iir; 383 pm_iir = dev_priv->pm_iir;
384 dev_priv->pm_iir = 0; 384 dev_priv->pm_iir = 0;
385 pm_imr = I915_READ(GEN6_PMIMR); 385 pm_imr = I915_READ(GEN6_PMIMR);
386 I915_WRITE(GEN6_PMIMR, 0);
386 spin_unlock_irq(&dev_priv->rps_lock); 387 spin_unlock_irq(&dev_priv->rps_lock);
387 388
388 if (!pm_iir) 389 if (!pm_iir)
@@ -420,7 +421,6 @@ static void gen6_pm_rps_work(struct work_struct *work)
420 * an *extremely* unlikely race with gen6_rps_enable() that is prevented 421 * an *extremely* unlikely race with gen6_rps_enable() that is prevented
421 * by holding struct_mutex for the duration of the write. 422 * by holding struct_mutex for the duration of the write.
422 */ 423 */
423 I915_WRITE(GEN6_PMIMR, pm_imr & ~pm_iir);
424 mutex_unlock(&dev_priv->dev->struct_mutex); 424 mutex_unlock(&dev_priv->dev->struct_mutex);
425} 425}
426 426