drm/i915: WARN if we receive any rps interrupts on gen>9
authorImre Deak <imre.deak@intel.com>
Wed, 19 Nov 2014 13:30:01 +0000 (15:30 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Nov 2014 14:03:01 +0000 (15:03 +0100)
This extends

commit 132f3f1767dbabfb01f3c9bd63098c65d91eeac9
Author: Imre Deak <imre.deak@intel.com>
Date:   Mon Nov 10 15:34:33 2014 +0200

    drm/i915: WARN if we receive any gen9 rps interrupts

to GEN>9 platforms as suggested by Paulo.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c

index e298518c944e6de3457788020323202bb26d9200..21c579e74451074007060ffe3582738e138c8498 100644 (file)
@@ -1689,9 +1689,9 @@ static void i9xx_pipe_crc_irq_handler(struct drm_device *dev, enum pipe pipe)
  * the work queue. */
 static void gen6_rps_irq_handler(struct drm_i915_private *dev_priv, u32 pm_iir)
 {
-       /* TODO: RPS on GEN9 is not supported yet. */
-       if (WARN_ONCE(INTEL_INFO(dev_priv)->gen == 9,
-                     "GEN9: unexpected RPS IRQ\n"))
+       /* TODO: RPS on GEN9+ is not supported yet. */
+       if (WARN_ONCE(INTEL_INFO(dev_priv)->gen >= 9,
+                     "GEN9+: unexpected RPS IRQ\n"))
                return;
 
        if (pm_iir & dev_priv->pm_rps_events) {