From 0d0ac4299607862288c32393296091ab331ff200 Mon Sep 17 00:00:00 2001 From: Emily Deng Date: Wed, 6 Nov 2019 16:20:54 +0800 Subject: SWDEV-210749 drm/amdgpu: Need to disable msix when unloading driver For driver reload test, it will report "can't enable MSI (MSI-X already enabled)". Change-Id: Id98a33e8404d8d803f20d9694f2f04a6e5251fb7 Signed-off-by: Emily Deng --- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 56ed4e3dc7d4..437c7476557d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -291,7 +291,11 @@ void amdgpu_irq_fini(struct amdgpu_device *adev) drm_irq_uninstall(adev->ddev); adev->irq.installed = false; if (adev->irq.msi_enabled) +#ifdef PCI_IRQ_MSI + pci_free_irq_vectors(adev->pdev); +#else pci_disable_msi(adev->pdev); +#endif if (!amdgpu_device_has_dc_support(adev)) flush_work(&adev->hotplug_work); } -- cgit v1.2.3