drm/radeon: implement handler for ACPI event

[deliverable/linux.git] / drivers / gpu / drm / radeon / radeon_kms.c

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 414b4acf69479abdfdcda63f226d112c0e3387da..8c2471854cd7e91d231ad1fa8d18ec729d2777dd 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -103,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
@@ -115,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);