| Message ID | 20200603114758.13295-1-piotr.stankiewicz@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Forward MSI-X vector enable error code in pci_alloc_irq_vectors_affinity() | expand |
On Wed, Jun 3, 2020 at 7:48 AM Piotr Stankiewicz <piotr.stankiewicz@intel.com> wrote: > > 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@intel.com> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > index 5ed4227f304b..2588dd1015db 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > @@ -249,15 +249,10 @@ int amdgpu_irq_init(struct amdgpu_device *adev) > > if (amdgpu_msi_ok(adev)) { > int nvec = pci_msix_vec_count(adev->pdev); I think you can drop pci_msix_vec_count() here. It's not used since we always request 1 vector. Alex > - unsigned int flags; > > - if (nvec <= 0) { > - flags = PCI_IRQ_MSI; > - } else { > - flags = PCI_IRQ_MSI | PCI_IRQ_MSIX; > - } > /* we only need one vector */ > - nvec = pci_alloc_irq_vectors(adev->pdev, 1, 1, flags); > + nvec = pci_alloc_irq_vectors(adev->pdev, 1, 1, > + PCI_IRQ_MSI_TYPES); > if (nvec > 0) { > adev->irq.msi_enabled = true; > dev_dbg(adev->dev, "amdgpu: using MSI/MSI-X.\n"); > -- > 2.17.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 5ed4227f304b..2588dd1015db 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -249,15 +249,10 @@ int amdgpu_irq_init(struct amdgpu_device *adev) if (amdgpu_msi_ok(adev)) { int nvec = pci_msix_vec_count(adev->pdev); - unsigned int flags; - if (nvec <= 0) { - flags = PCI_IRQ_MSI; - } else { - flags = PCI_IRQ_MSI | PCI_IRQ_MSIX; - } /* we only need one vector */ - nvec = pci_alloc_irq_vectors(adev->pdev, 1, 1, flags); + nvec = pci_alloc_irq_vectors(adev->pdev, 1, 1, + PCI_IRQ_MSI_TYPES); if (nvec > 0) { adev->irq.msi_enabled = true; dev_dbg(adev->dev, "amdgpu: using MSI/MSI-X.\n");