drm/radeon: Remove calls to drm_put_dev()

Since the allocation of the drivers main structure was changed to
devm_drm_dev_alloc() drm_put_dev()'ing to trigger it to be free'd
should be done by devres.

However, drm_put_dev() is still in the probe error and device remove
paths. When the driver fails to probe warnings like the following are
shown because devres is trying to drm_put_dev() after the driver
already did it.

[    5.642230] radeon 0000:01:05.0: probe with driver radeon failed with error -22
[    5.649605] ------------[ cut here ]------------
[    5.649607] refcount_t: underflow; use-after-free.
[    5.649620] WARNING: CPU: 0 PID: 357 at lib/refcount.c:28 refcount_warn_saturate+0xbe/0x110

Fixes: a9ed2f052c5c ("drm/radeon: change drm_dev_alloc to devm_drm_dev_alloc")
Signed-off-by: Daniel Palmer <daniel@0x0f.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 3eb8c0b4c091da0a623ade0d3ee7aa4a93df1ea4)

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 88e821d67af77a8f8c19d683e19a026799933a3f..9c8907bc61d9fbc1164d0f1cd3bd8bef6beae448 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -314,17 +314,17 @@ static int radeon_pci_probe(struct pci_dev *pdev,
 
        ret = pci_enable_device(pdev);
        if (ret)
-               goto err_free;
+               return ret;
 
        pci_set_drvdata(pdev, ddev);
 
        ret = radeon_driver_load_kms(ddev, flags);
        if (ret)
-               goto err_agp;
+               goto err;
 
        ret = drm_dev_register(ddev, flags);
        if (ret)
-               goto err_agp;
+               goto err;
 
        if (rdev->mc.real_vram_size <= (8 * 1024 * 1024))
                format = drm_format_info(DRM_FORMAT_C8);
@@ -337,30 +337,14 @@ static int radeon_pci_probe(struct pci_dev *pdev,
 
        return 0;
 
-err_agp:
+err:
        pci_disable_device(pdev);
-err_free:
-       drm_dev_put(ddev);
        return ret;
 }
 
-static void
-radeon_pci_remove(struct pci_dev *pdev)
-{
-       struct drm_device *dev = pci_get_drvdata(pdev);
-
-       drm_put_dev(dev);
-}
-
 static void
 radeon_pci_shutdown(struct pci_dev *pdev)
 {
-       /* if we are running in a VM, make sure the device
-        * torn down properly on reboot/shutdown
-        */
-       if (radeon_device_is_virtual())
-               radeon_pci_remove(pdev);
-
 #if defined(CONFIG_PPC64) || defined(CONFIG_MACH_LOONGSON64)
        /*
         * Some adapters need to be suspended before a
@@ -613,7 +597,6 @@ static struct pci_driver radeon_kms_pci_driver = {
        .name = DRIVER_NAME,
        .id_table = pciidlist,
        .probe = radeon_pci_probe,
-       .remove = radeon_pci_remove,
        .shutdown = radeon_pci_shutdown,
        .driver.pm = &radeon_pm_ops,
 };