From: Rodrigo Vivi Date: Mon, 16 Sep 2024 16:19:37 +0000 (-0400) Subject: drm/i915/irq: Uninstall should be called just once X-Git-Tag: v6.13-rc1~122^2~19^2~145 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b7e9ddb9ab2965025a809b3299394e3151ed75f;p=thirdparty%2Fkernel%2Flinux.git drm/i915/irq: Uninstall should be called just once There shouldn't be any path where the irq uninstall is called twice nowadays. So, remove the FIXME commend and change the check to a WARN. Suggested-by: Jani Nikula Reviewed-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20240916161937.537334-1-rodrigo.vivi@intel.com Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 723d1334fdbbc..a784803f709ae 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1422,13 +1422,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv) { int irq = to_pci_dev(dev_priv->drm.dev)->irq; - /* - * FIXME we can get called twice during driver probe - * error handling as well as during driver remove due to - * intel_display_driver_remove() calling us out of sequence. - * Would be nice if it didn't do that... - */ - if (!dev_priv->irqs_enabled) + if (drm_WARN_ON(&dev_priv->drm, !dev_priv->irqs_enabled)) return; intel_irq_reset(dev_priv);