]> Pileus Git - ~andy/linux/commitdiff
Revert "drm/radeon: Implement radeon_pci_shutdown"
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 12 Dec 2013 14:05:06 +0000 (09:05 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 12 Dec 2013 17:22:06 +0000 (12:22 -0500)
This causes a race condition between drm_dev_unregister()
and pci_driver.shutdown at shutdown or driver unload time.

We need to revisit how to properly support kexec within
the drm.

This reverts commit 846ae41ae99d314bf2a02784152208a6ddf7eddc.

drivers/gpu/drm/radeon/radeon_drv.c

index 9f5ff28864f6e3ccf4f4736cc55307735d87a70a..1958b36ad0e5cdddf623b8a54a16df0c501ca668 100644 (file)
@@ -508,15 +508,6 @@ static const struct file_operations radeon_driver_kms_fops = {
 #endif
 };
 
-
-static void
-radeon_pci_shutdown(struct pci_dev *pdev)
-{
-       struct drm_device *dev = pci_get_drvdata(pdev);
-
-       radeon_driver_unload_kms(dev);
-}
-
 static struct drm_driver kms_driver = {
        .driver_features =
            DRIVER_USE_AGP |
@@ -586,7 +577,6 @@ static struct pci_driver radeon_kms_pci_driver = {
        .probe = radeon_pci_probe,
        .remove = radeon_pci_remove,
        .driver.pm = &radeon_pm_ops,
-       .shutdown = radeon_pci_shutdown,
 };
 
 static int __init radeon_init(void)