aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorThomas Hellstrom <thellstrom@vmware.com>2015-03-10 11:07:40 -0700
committerThomas Hellstrom <thellstrom@vmware.com>2015-03-11 11:47:41 -0700
commitfd3e4d6e26288d12b566912f692e278e8db15b82 (patch)
treeb89be41478b36f815c475c1cc2d47d19d07869df /drivers/gpu
parentdrm/vmwgfx: Correctly NULLify dma buffer pointer on failure (diff)
downloadlinux-dev-fd3e4d6e26288d12b566912f692e278e8db15b82.tar.xz
linux-dev-fd3e4d6e26288d12b566912f692e278e8db15b82.zip
drm/vmwgfx: Fix an issue with the device losing its irq line on module unload
Starting with commit b4b55cda5874 ("x86/PCI: Refine the way to release PCI IRQ resources") the device lost its irq resource on module unload. While that's ok and apparently intentional, the driver never got the resource back on module load The code apparently wants drivers to disable the pci device at pci device driver removal, so lets do that. That fixes the issue. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 74a2e2318693..e13b9cbc304e 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1238,6 +1238,7 @@ static void vmw_remove(struct pci_dev *pdev)
{
struct drm_device *dev = pci_get_drvdata(pdev);
+ pci_disable_device(pdev);
drm_put_dev(dev);
}