1 files changed, 12 insertions, 5 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 8a7f87f17c13..83b8d8aa71c0 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -50,6 +50,7 @@ int radeon_driver_unload_kms(struct drm_device *dev)
 
         if (rdev == NULL)
                 return 0;
+        radeon_acpi_fini(rdev);
         radeon_modeset_fini(rdev);
         radeon_device_fini(rdev);
         kfree(rdev);
@@ -102,11 +103,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
                 goto out;
         }
 
-        /* Call ACPI methods */
-        acpi_status = radeon_acpi_init(rdev);
-        if (acpi_status)
-                dev_dbg(&dev->pdev->dev, "Error during ACPI methods call\n");
-
         /* Again modeset_init should fail only on fatal error
          * otherwise it should provide enough functionalities
          * for shadowfb to run
@@ -114,6 +110,17 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
         r = radeon_modeset_init(rdev);
         if (r)
                 dev_err(&dev->pdev->dev, "Fatal error during modeset init\n");
+
+        /* Call ACPI methods: require modeset init
+         * but failure is not fatal
+         */
+        if (!r) {
+                acpi_status = radeon_acpi_init(rdev);
+                if (acpi_status)
+                dev_dbg(&dev->pdev->dev,
+                                "Error during ACPI methods call\n");
+        }
+
 out:
         if (r)
                 radeon_driver_unload_kms(dev);