[PATCH 07/15] drm/amdgpu: use PCI_IRQ_MSI_TYPES where appropriate

Ruhl, Michael J michael.j.ruhl at intel.com
Tue Jun 2 13:35:20 UTC 2020


>-----Original Message-----
>From: dri-devel <dri-devel-bounces at lists.freedesktop.org> On Behalf Of
>Piotr Stankiewicz
>Sent: Tuesday, June 2, 2020 5:21 AM
>To: Alex Deucher <alexander.deucher at amd.com>; Christian König
><christian.koenig at amd.com>; David Zhou <David1.Zhou at amd.com>; David
>Airlie <airlied at linux.ie>; Daniel Vetter <daniel at ffwll.ch>
>Cc: Stankiewicz, Piotr <piotr.stankiewicz at intel.com>; dri-
>devel at lists.freedesktop.org; amd-gfx at lists.freedesktop.org; linux-
>kernel at vger.kernel.org
>Subject: [PATCH 07/15] drm/amdgpu: use PCI_IRQ_MSI_TYPES where
>appropriate
>
>Seeing as there is shorthand available to use when asking for any type
>of interrupt, or any type of message signalled interrupt, leverage it.
>
>Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz at intel.com>
>Reviewed-by: Andy Shevchenko <andriy.shevchenko at intel.com>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
>b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
>index 5ed4227f304b..6dbe173a9fd4 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
>@@ -251,11 +251,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
> 		int nvec = pci_msix_vec_count(adev->pdev);
> 		unsigned int flags;
>
>-		if (nvec <= 0) {
>+		if (nvec > 0)
>+			flags = PCI_IRQ_MSI_TYPES;
>+		else
> 			flags = PCI_IRQ_MSI;
>-		} else {
>-			flags = PCI_IRQ_MSI | PCI_IRQ_MSIX;
>-		}

Minor nit:

Is it really necessary to set do this check?  Can flags just
be set?

I.e.: 
	flags = PCI_IRQ_MSI_TYPES;

pci_alloc_irq_vector() tries stuff in order.  If MSIX is not available,
it will try MSI.

M

>+
> 		/* we only need one vector */
> 		nvec = pci_alloc_irq_vectors(adev->pdev, 1, 1, flags);
> 		if (nvec > 0) {
>--
>2.17.2
>
>_______________________________________________
>dri-devel mailing list
>dri-devel at lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/dri-devel


More information about the amd-gfx mailing list