--- sys/dev/drm/i915/intel_hotplug.c
+++ sys/dev/drm/i915/intel_hotplug.c
@@ -483,8 +483,9 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,
 		}
 	}
 
-	if (storm_detected && dev_priv->display_irqs_enabled)
+	if (storm_detected && dev_priv->display_irqs_enabled &&
+	    dev_priv->display.hpd_irq_setup)
 		dev_priv->display.hpd_irq_setup(dev_priv);
+
 	lockmgr(&dev_priv->irq_lock, LK_RELEASE);
 
 	/*