[Intel-xe] [PATCH v3 03/20] drm/xe/irq: Don't call pci_free_irq_vectors

Matt Roper matthew.d.roper at intel.com
Wed Nov 15 20:49:25 UTC 2023


On Tue, Nov 14, 2023 at 02:02:14PM +0100, Michał Winiarski wrote:
> For devres managed devices, pci_alloc_irq_vectors is also managed (see
> pci_setup_msi_context for reference).
> PCI device used by Xe is devres managed (it was enabled with
> pcim_enable_device), which means that calls to pci_free_irq_vectors are
> redundant and can be safely removed.
> 
> Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_irq.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_irq.c b/drivers/gpu/drm/xe/xe_irq.c
> index c5315e02fc5bb..df4da774d0275 100644
> --- a/drivers/gpu/drm/xe/xe_irq.c
> +++ b/drivers/gpu/drm/xe/xe_irq.c
> @@ -603,7 +603,6 @@ static void irq_uninstall(struct drm_device *drm, void *arg)
>  
>  	irq = pci_irq_vector(pdev, 0);
>  	free_irq(irq, xe);
> -	pci_free_irq_vectors(pdev);
>  }
>  
>  int xe_irq_install(struct xe_device *xe)
> @@ -630,7 +629,7 @@ int xe_irq_install(struct xe_device *xe)
>  	err = request_irq(irq, irq_handler, IRQF_SHARED, DRIVER_NAME, xe);
>  	if (err < 0) {
>  		drm_err(&xe->drm, "Failed to request MSI/MSIX IRQ %d\n", err);
> -		goto free_pci_irq_vectors;
> +		return err;
>  	}
>  
>  	xe->irq.enabled = true;
> @@ -645,8 +644,6 @@ int xe_irq_install(struct xe_device *xe)
>  
>  free_irq_handler:
>  	free_irq(irq, xe);
> -free_pci_irq_vectors:
> -	pci_free_irq_vectors(pdev);
>  
>  	return err;
>  }
> -- 
> 2.42.1
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation


More information about the Intel-xe mailing list