1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c
index 69427722d20e..dc425e74a268 100644
--- a/drivers/gpu/drm/i915/i915_opregion.c
+++ b/drivers/gpu/drm/i915/i915_opregion.c
@@ -370,11 +370,8 @@ int intel_opregion_init(struct drm_device *dev, int resume)
         if (mboxes & MBOX_ACPI) {
                 DRM_DEBUG("Public ACPI methods supported\n");
                 opregion->acpi = base + OPREGION_ACPI_OFFSET;
-                if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                if (drm_core_check_feature(dev, DRIVER_MODESET))
                         intel_didl_outputs(dev);
-                        if (!resume)
-                                acpi_video_register();
-                }
         } else {
                 DRM_DEBUG("Public ACPI methods not supported\n");
                 err = -ENOTSUPP;
@@ -389,8 +386,13 @@ int intel_opregion_init(struct drm_device *dev, int resume)
         if (mboxes & MBOX_ASLE) {
                 DRM_DEBUG("ASLE supported\n");
                 opregion->asle = base + OPREGION_ASLE_OFFSET;
+                opregion_enable_asle(dev);
         }
 
+        if (!resume)
+                acpi_video_register();
+
+
         /* Notify BIOS we are ready to handle ACPI video ext notifs.
          * Right now, all the events are handled by the ACPI video module.
          * We don't actually need to do anything with them. */
@@ -408,7 +410,7 @@ err_out:
         return err;
 }
 
-void intel_opregion_free(struct drm_device *dev)
+void intel_opregion_free(struct drm_device *dev, int suspend)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_opregion *opregion = &dev_priv->opregion;
@@ -416,6 +418,9 @@ void intel_opregion_free(struct drm_device *dev)
         if (!opregion->enabled)
                 return;
 
+        if (!suspend)
+                acpi_video_exit();
+
         opregion->acpi->drdy = 0;
 
         system_opregion = NULL;