Re: [PATCH] drm/i915/irq: Uninstall should be called just once

[Jani Nikula <jani.nikula@intel.com>]

On Mon, 16 Sep 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> 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 <jani.nikula@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Please double check the CI results, I didn't spot anything related to
this.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> ---
>  drivers/gpu/drm/i915/i915_irq.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index d42997fdee65..f2ea7a550a26 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1431,13 +1431,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);

-- 
Jani Nikula, Intel