[Intel-gfx] [PATCH 19/20] drm/i915: Warn when display irq functions is executed when display is disabled

[José Roberto de Souza]

With previous patches any of this warnings shows up but lets add then
so any other patch that breaks that can be caught by CI tests.

Signed-off-by: José Roberto de Souza <jose.so...@intel.com>
---
 drivers/gpu/drm/i915/i915_irq.c      | 14 ++++++++++++++
 drivers/gpu/drm/i915/intel_hotplug.c |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index cb82f56cd7dc..f785ec61fea8 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2511,6 +2511,8 @@ static void ilk_display_irq_handler(struct 
drm_i915_private *dev_priv,
        enum pipe pipe;
        u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG;
 
+       WARN_ON_ONCE(!INTEL_INFO(dev_priv)->num_pipes);
+
        if (hotplug_trigger)
                ilk_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_ilk);
 
@@ -2557,6 +2559,8 @@ static void ivb_display_irq_handler(struct 
drm_i915_private *dev_priv,
        enum pipe pipe;
        u32 hotplug_trigger = de_iir & DE_DP_A_HOTPLUG_IVB;
 
+       WARN_ON_ONCE(!INTEL_INFO(dev_priv)->num_pipes);
+
        if (hotplug_trigger)
                ilk_hpd_irq_handler(dev_priv, hotplug_trigger, hpd_ivb);
 
@@ -2725,6 +2729,8 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, 
u32 master_ctl)
        u32 iir;
        enum pipe pipe;
 
+       WARN_ON_ONCE(!INTEL_INFO(dev_priv)->num_pipes);
+
        if (master_ctl & GEN8_DE_MISC_IRQ) {
                iir = I915_READ(GEN8_DE_MISC_IIR);
                if (iir) {
@@ -3867,6 +3873,8 @@ static void spt_hpd_irq_setup(struct drm_i915_private 
*dev_priv)
 {
        u32 hotplug_irqs, enabled_irqs;
 
+       WARN_ON_ONCE(!INTEL_INFO(dev_priv)->num_pipes);
+
        hotplug_irqs = SDE_HOTPLUG_MASK_SPT;
        enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_spt);
 
@@ -3895,6 +3903,8 @@ static void ilk_hpd_irq_setup(struct drm_i915_private 
*dev_priv)
 {
        u32 hotplug_irqs, enabled_irqs;
 
+       WARN_ON_ONCE(!INTEL_INFO(dev_priv)->num_pipes);
+
        if (INTEL_GEN(dev_priv) >= 8) {
                hotplug_irqs = GEN8_PORT_DP_A_HOTPLUG;
                enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_bdw);
@@ -3957,6 +3967,8 @@ static void bxt_hpd_irq_setup(struct drm_i915_private 
*dev_priv)
 {
        u32 hotplug_irqs, enabled_irqs;
 
+       WARN_ON_ONCE(!INTEL_INFO(dev_priv)->num_pipes);
+
        enabled_irqs = intel_hpd_enabled_irqs(dev_priv, hpd_bxt);
        hotplug_irqs = BXT_DE_PORT_HOTPLUG_MASK;
 
@@ -4674,6 +4686,8 @@ static void i915_hpd_irq_setup(struct drm_i915_private 
*dev_priv)
 {
        u32 hotplug_en;
 
+       WARN_ON_ONCE(!INTEL_INFO(dev_priv)->num_pipes);
+
        lockdep_assert_held(&dev_priv->irq_lock);
 
        /* Note HDMI and DP share hotplug bits */
diff --git a/drivers/gpu/drm/i915/intel_hotplug.c 
b/drivers/gpu/drm/i915/intel_hotplug.c
index 648a13c6043c..908d8e589f9a 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -399,6 +399,8 @@ void intel_hpd_irq_handler(struct drm_i915_private 
*dev_priv,
        if (!pin_mask)
                return;
 
+       WARN_ON_ONCE(!INTEL_INFO(dev_priv)->num_pipes);
+
        spin_lock(&dev_priv->irq_lock);
        for_each_intel_encoder(&dev_priv->drm, encoder) {
                enum hpd_pin pin = encoder->hpd_pin;
-- 
2.18.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx