diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 16:08:35 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 16:08:35 +0100 |
| commit | 80c1834fc86c2bbacb54a8fc3c04a8b0066b0996 (patch) | |
| tree | 8200248706960af8b779e9144f5b51c670602228 /drivers/gpu/drm/i915/i915_irq.c | |
| parent | 22076c7712be29a602de45b1c573f31adbd428a9 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
| download | op-kernel-dev-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.zip op-kernel-dev-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.tar.gz | |
Merge tag 'v3.5-rc6' into irqdomain/next
Linux 3.5-rc6
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index b1fe0ed..ed3224c 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -412,7 +412,6 @@ static void gen6_queue_rps_work(struct drm_i915_private *dev_priv, */ spin_lock_irqsave(&dev_priv->rps_lock, flags); - WARN(dev_priv->pm_iir & pm_iir, "Missed a PM interrupt\n"); dev_priv->pm_iir |= pm_iir; I915_WRITE(GEN6_PMIMR, dev_priv->pm_iir); POSTING_READ(GEN6_PMIMR); |
