drm/radeon: re-organize the acpi notifier callback

Move it out of the radeon_pm.c and into radeon_acpi.c since
we use it for more than just pm now.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

4 files changed, 48 insertions, 43 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index dea5f08bd23b..b5b16878f0cf 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1869,12 +1869,14 @@ extern void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_displ
 extern int ni_init_microcode(struct radeon_device *rdev);
 extern int ni_mc_load_microcode(struct radeon_device *rdev);
 
-/* radeon_acpi.c */ 
-#if defined(CONFIG_ACPI) 
-extern int radeon_acpi_init(struct radeon_device *rdev); 
-#else 
-static inline int radeon_acpi_init(struct radeon_device *rdev) { return 0; } 
-#endif 
+/* radeon_acpi.c */
+#if defined(CONFIG_ACPI)
+extern int radeon_acpi_init(struct radeon_device *rdev);
+extern void radeon_acpi_fini(struct radeon_device *rdev);
+#else
+static inline int radeon_acpi_init(struct radeon_device *rdev) { return 0; }
+static inline void radeon_acpi_fini(struct radeon_device *rdev) { }
+#endif
 
 #include "radeon_object.h"
 
diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c
index b052a556db79..ea22f4416f48 100644
--- a/drivers/gpu/drm/radeon/radeon_acpi.c
+++ b/drivers/gpu/drm/radeon/radeon_acpi.c
@@ -24,6 +24,7 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
+#include <linux/power_supply.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/video.h>
@@ -38,6 +39,10 @@
 
 #include <linux/vga_switcheroo.h>
 
+#define ACPI_AC_CLASS           "ac_adapter"
+
+extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev);
+
 struct atif_verify_interface {
         u16 size;               /* structure size in bytes (includes size field) */
         u16 version;            /* version */
@@ -299,6 +304,26 @@ int radeon_atif_handler(struct radeon_device *rdev,
         return NOTIFY_OK;
 }
 
+static int radeon_acpi_event(struct notifier_block *nb,
+                             unsigned long val,
+                             void *data)
+{
+        struct radeon_device *rdev = container_of(nb, struct radeon_device, acpi_nb);
+        struct acpi_bus_event *entry = (struct acpi_bus_event *)data;
+
+        if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
+                if (power_supply_is_system_supplied() > 0)
+                        DRM_DEBUG_DRIVER("pm: AC\n");
+                else
+                        DRM_DEBUG_DRIVER("pm: DC\n");
+
+                radeon_pm_acpi_event_handler(rdev);
+        }
+
+        /* Check for pending SBIOS requests */
+        return radeon_atif_handler(rdev, entry);
+}
+
 /* Call all ACPI methods here */
 int radeon_acpi_init(struct radeon_device *rdev)
 {
@@ -367,6 +392,13 @@ int radeon_acpi_init(struct radeon_device *rdev)
         }
 
 out:
+        rdev->acpi_nb.notifier_call = radeon_acpi_event;
+        register_acpi_notifier(&rdev->acpi_nb);
+
         return ret;
 }
 
+void radeon_acpi_fini(struct radeon_device *rdev)
+{
+        unregister_acpi_notifier(&rdev->acpi_nb);
+}
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 8c2471854cd7..cb8e94d1a2b2 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -51,6 +51,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);
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 14e544e0eb31..c15e505a15bc 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -22,12 +22,8 @@
  */
 #include "drmP.h"
 #include "radeon.h"
-#include "radeon_acpi.h"
 #include "avivod.h"
 #include "atom.h"
-#ifdef CONFIG_ACPI
-#include <linux/acpi.h>
-#endif
 #include <linux/power_supply.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
@@ -51,8 +47,6 @@ static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish
 static void radeon_pm_update_profile(struct radeon_device *rdev);
 static void radeon_pm_set_clocks(struct radeon_device *rdev);
 
-#define ACPI_AC_CLASS           "ac_adapter"
-
 int radeon_pm_get_type_index(struct radeon_device *rdev,
                              enum radeon_pm_state_type ps_type,
                              int instance)
@@ -71,34 +65,17 @@ int radeon_pm_get_type_index(struct radeon_device *rdev,
         return rdev->pm.default_power_state_index;
 }
 
-#ifdef CONFIG_ACPI
-static int radeon_acpi_event(struct notifier_block *nb,
-                             unsigned long val,
-                             void *data)
+void radeon_pm_acpi_event_handler(struct radeon_device *rdev)
 {
-        struct radeon_device *rdev = container_of(nb, struct radeon_device, acpi_nb);
-        struct acpi_bus_event *entry = (struct acpi_bus_event *)data;
-
-        if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
-                if (power_supply_is_system_supplied() > 0)
-                        DRM_DEBUG_DRIVER("pm: AC\n");
-                else
-                        DRM_DEBUG_DRIVER("pm: DC\n");
-
-                if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
-                        if (rdev->pm.profile == PM_PROFILE_AUTO) {
-                                mutex_lock(&rdev->pm.mutex);
-                                radeon_pm_update_profile(rdev);
-                                radeon_pm_set_clocks(rdev);
-                                mutex_unlock(&rdev->pm.mutex);
-                        }
+        if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
+                if (rdev->pm.profile == PM_PROFILE_AUTO) {
+                        mutex_lock(&rdev->pm.mutex);
+                        radeon_pm_update_profile(rdev);
+                        radeon_pm_set_clocks(rdev);
+                        mutex_unlock(&rdev->pm.mutex);
                 }
         }
-
-        /* Check for pending SBIOS requests */
-        return radeon_atif_handler(rdev, entry);
 }
-#endif
 
 static void radeon_pm_update_profile(struct radeon_device *rdev)
 {
@@ -629,10 +606,6 @@ int radeon_pm_init(struct radeon_device *rdev)
                 if (ret)
                         DRM_ERROR("failed to create device file for power method\n");
 
-#ifdef CONFIG_ACPI
-                rdev->acpi_nb.notifier_call = radeon_acpi_event;
-                register_acpi_notifier(&rdev->acpi_nb);
-#endif
                 if (radeon_debugfs_pm_init(rdev)) {
                         DRM_ERROR("Failed to register debugfs file for PM!\n");
                 }
@@ -663,9 +636,6 @@ void radeon_pm_fini(struct radeon_device *rdev)
 
                 device_remove_file(rdev->dev, &dev_attr_power_profile);
                 device_remove_file(rdev->dev, &dev_attr_power_method);
-#ifdef CONFIG_ACPI
-                unregister_acpi_notifier(&rdev->acpi_nb);
-#endif
         }
 
         if (rdev->pm.power_state)