[PATCH 1/2] drm/amdgpu: improve MSI-X handling

[PATCH 1/2] drm/amdgpu: improve MSI-X handling

[Alex Deucher]

Check the number of supported vectors and fall back to MSI if
we return or error or 0 MSI-X vectors.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 50771b2757dc..98aa28edba6a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -245,11 +245,19 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
 	adev->irq.msi_enabled = false;
 
 	if (amdgpu_msi_ok(adev)) {
-		int nvec = pci_alloc_irq_vectors(adev->pdev, 1, pci_msix_vec_count(adev->pdev),
-					PCI_IRQ_MSI | PCI_IRQ_MSIX);
+		unsigned int flags;
+		int nvec = pci_msix_vec_count(adev->pdev);
+
+		if (nvec <= 0) {
+			flags = PCI_IRQ_MSI;
+			nvec = 1;
+		} else {
+			flags = PCI_IRQ_MSI | PCI_IRQ_MSIX;
+		}
+		nvec = pci_alloc_irq_vectors(adev->pdev, 1, nvec, flags);
 		if (nvec > 0) {
 			adev->irq.msi_enabled = true;
-			dev_dbg(adev->dev, "amdgpu: using MSI.\n");
+			dev_dbg(adev->dev, "amdgpu: using MSI/MSI-X.\n");
 		}
 	}
 
-- 
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/2] drm/amdgpu: disable MSI-X on APUs

[Alex Deucher]

Raven claims to support them, but seems to have problems.  Stick
with MSIs for now on APUs.

Tested-by: Tom St Denis <tom.stdenis@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 98aa28edba6a..8f2236bd7d0e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -248,7 +248,8 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
 		unsigned int flags;
 		int nvec = pci_msix_vec_count(adev->pdev);
 
-		if (nvec <= 0) {
+		/* Raven claims to support MSI-X, but seems to have problems */
+		if ((nvec <= 0) || (adev->flags & AMD_IS_APU)) {
 			flags = PCI_IRQ_MSI;
 			nvec = 1;
 		} else {
-- 
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 2/2] drm/amdgpu: disable MSI-X on APUs

[Liu, Shaoyun]

Thanks Alex and  Tom to catch and  revolve the issue .  I didn't do 
enough test on original test.

We don't need to enable msix  on APU .   The serials is reviewed by 
shaoyun.liu <shaoyun.liu@amd.com>


Regards

shaoyun.liu



On 2019-10-03 10:13 a.m., Alex Deucher wrote:
> Raven claims to support them, but seems to have problems.  Stick
> with MSIs for now on APUs.
>
> Tested-by: Tom St Denis <tom.stdenis@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> index 98aa28edba6a..8f2236bd7d0e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
> @@ -248,7 +248,8 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
>   		unsigned int flags;
>   		int nvec = pci_msix_vec_count(adev->pdev);
>   
> -		if (nvec <= 0) {
> +		/* Raven claims to support MSI-X, but seems to have problems */
> +		if ((nvec <= 0) || (adev->flags & AMD_IS_APU)) {
>   			flags = PCI_IRQ_MSI;
>   			nvec = 1;
>   		} else {
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH 1/2] drm/amdgpu: improve MSI-X handling

[Huang, Ray]

Series are Reviewed-by: Huang Rui <ray.huang@amd.com>

-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Thursday, October 3, 2019 10:13 AM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
Subject: [PATCH 1/2] drm/amdgpu: improve MSI-X handling

Check the number of supported vectors and fall back to MSI if we return or error or 0 MSI-X vectors.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 50771b2757dc..98aa28edba6a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -245,11 +245,19 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
 	adev->irq.msi_enabled = false;
 
 	if (amdgpu_msi_ok(adev)) {
-		int nvec = pci_alloc_irq_vectors(adev->pdev, 1, pci_msix_vec_count(adev->pdev),
-					PCI_IRQ_MSI | PCI_IRQ_MSIX);
+		unsigned int flags;
+		int nvec = pci_msix_vec_count(adev->pdev);
+
+		if (nvec <= 0) {
+			flags = PCI_IRQ_MSI;
+			nvec = 1;
+		} else {
+			flags = PCI_IRQ_MSI | PCI_IRQ_MSIX;
+		}
+		nvec = pci_alloc_irq_vectors(adev->pdev, 1, nvec, flags);
 		if (nvec > 0) {
 			adev->irq.msi_enabled = true;
-			dev_dbg(adev->dev, "amdgpu: using MSI.\n");
+			dev_dbg(adev->dev, "amdgpu: using MSI/MSI-X.\n");
 		}
 	}
 
--
2.20.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx