diff options
| author | Dave Airlie <[email protected]> | 2019-11-13 22:43:06 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-11-13 22:43:07 +0000 |
| commit | 0990ca235d9145ec40ed002f8ff7f6e1a910db4f (patch) | |
| tree | f3b622905180952f792411641c39fd433d839f9c /drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | |
| parent | Merge v5.4-rc7 into drm-next (diff) | |
| parent | drm/amdgpu/powerplay: fix AVFS handling with custom powerplay table (diff) | |
| download | kernel-0990ca235d9145ec40ed002f8ff7f6e1a910db4f.tar.gz kernel-0990ca235d9145ec40ed002f8ff7f6e1a910db4f.zip | |
Merge tag 'drm-next-5.5-2019-11-08' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.5-2019-11-08:
amdgpu:
- Enable VCN dynamic powergating on RV/RV2
- Fixes for Navi14
- Misc Navi fixes
- Fix MSI-X tear down
- Misc Arturus fixes
- Fix xgmi powerstate handling
- Documenation fixes
scheduler:
- Fix static code checker warning
- Fix possible thread reactivation while thread is stopped
- Avoid cleanup if thread is parked
radeon:
- SI dpm fix ported from amdgpu
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 6f3b03f6224f..30d540d23b77 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -311,7 +311,7 @@ void amdgpu_irq_fini(struct amdgpu_device *adev) drm_irq_uninstall(adev->ddev); adev->irq.installed = false; if (adev->irq.msi_enabled) - pci_disable_msi(adev->pdev); + pci_free_irq_vectors(adev->pdev); if (!amdgpu_device_has_dc_support(adev)) flush_work(&adev->hotplug_work); } |