1 files changed, 94 insertions, 64 deletions

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index e034b4166d32..b8f106d9ecf8 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -773,70 +773,6 @@ static void intel_setup_cadls(struct drm_i915_private *dev_priv)
                 opregion->acpi->cadl[i] = 0;
 }
 
-void intel_opregion_register(struct drm_i915_private *dev_priv)
-{
-        struct intel_opregion *opregion = &dev_priv->opregion;
-
-        if (!opregion->header)
-                return;
-
-        if (opregion->acpi) {
-                intel_didl_outputs(dev_priv);
-                intel_setup_cadls(dev_priv);
-
-                /* 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. */
-                opregion->acpi->csts = 0;
-                opregion->acpi->drdy = 1;
-
-                opregion->acpi_notifier.notifier_call = intel_opregion_video_event;
-                register_acpi_notifier(&opregion->acpi_notifier);
-        }
-
-        if (opregion->asle) {
-                opregion->asle->tche = ASLE_TCHE_BLC_EN;
-                opregion->asle->ardy = ASLE_ARDY_READY;
-        }
-}
-
-void intel_opregion_unregister(struct drm_i915_private *dev_priv)
-{
-        struct intel_opregion *opregion = &dev_priv->opregion;
-
-        if (!opregion->header)
-                return;
-
-        if (opregion->asle)
-                opregion->asle->ardy = ASLE_ARDY_NOT_READY;
-
-        cancel_work_sync(&dev_priv->opregion.asle_work);
-
-        if (opregion->acpi) {
-                opregion->acpi->drdy = 0;
-
-                unregister_acpi_notifier(&opregion->acpi_notifier);
-                opregion->acpi_notifier.notifier_call = NULL;
-        }
-
-        /* just clear all opregion memory pointers now */
-        memunmap(opregion->header);
-        if (opregion->rvda) {
-                memunmap(opregion->rvda);
-                opregion->rvda = NULL;
-        }
-        if (opregion->vbt_firmware) {
-                kfree(opregion->vbt_firmware);
-                opregion->vbt_firmware = NULL;
-        }
-        opregion->header = NULL;
-        opregion->acpi = NULL;
-        opregion->swsci = NULL;
-        opregion->asle = NULL;
-        opregion->vbt = NULL;
-        opregion->lid_state = NULL;
-}
-
 static void swsci_setup(struct drm_i915_private *dev_priv)
 {
         struct intel_opregion *opregion = &dev_priv->opregion;
@@ -1115,3 +1051,97 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
 
         return ret - 1;
 }
+
+void intel_opregion_register(struct drm_i915_private *i915)
+{
+        struct intel_opregion *opregion = &i915->opregion;
+
+        if (!opregion->header)
+                return;
+
+        if (opregion->acpi) {
+                opregion->acpi_notifier.notifier_call =
+                        intel_opregion_video_event;
+                register_acpi_notifier(&opregion->acpi_notifier);
+        }
+
+        intel_opregion_resume(i915);
+}
+
+void intel_opregion_resume(struct drm_i915_private *i915)
+{
+        struct intel_opregion *opregion = &i915->opregion;
+
+        if (!opregion->header)
+                return;
+
+        if (opregion->acpi) {
+                intel_didl_outputs(i915);
+                intel_setup_cadls(i915);
+
+                /*
+                 * 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.
+                 */
+                opregion->acpi->csts = 0;
+                opregion->acpi->drdy = 1;
+        }
+
+        if (opregion->asle) {
+                opregion->asle->tche = ASLE_TCHE_BLC_EN;
+                opregion->asle->ardy = ASLE_ARDY_READY;
+        }
+
+        intel_opregion_notify_adapter(i915, PCI_D0);
+}
+
+void intel_opregion_suspend(struct drm_i915_private *i915, pci_power_t state)
+{
+        struct intel_opregion *opregion = &i915->opregion;
+
+        if (!opregion->header)
+                return;
+
+        intel_opregion_notify_adapter(i915, state);
+
+        if (opregion->asle)
+                opregion->asle->ardy = ASLE_ARDY_NOT_READY;
+
+        cancel_work_sync(&i915->opregion.asle_work);
+
+        if (opregion->acpi)
+                opregion->acpi->drdy = 0;
+}
+
+void intel_opregion_unregister(struct drm_i915_private *i915)
+{
+        struct intel_opregion *opregion = &i915->opregion;
+
+        intel_opregion_suspend(i915, PCI_D1);
+
+        if (!opregion->header)
+                return;
+
+        if (opregion->acpi_notifier.notifier_call) {
+                unregister_acpi_notifier(&opregion->acpi_notifier);
+                opregion->acpi_notifier.notifier_call = NULL;
+        }
+
+        /* just clear all opregion memory pointers now */
+        memunmap(opregion->header);
+        if (opregion->rvda) {
+                memunmap(opregion->rvda);
+                opregion->rvda = NULL;
+        }
+        if (opregion->vbt_firmware) {
+                kfree(opregion->vbt_firmware);
+                opregion->vbt_firmware = NULL;
+        }
+        opregion->header = NULL;
+        opregion->acpi = NULL;
+        opregion->swsci = NULL;
+        opregion->asle = NULL;
+        opregion->vbt = NULL;
+        opregion->lid_state = NULL;
+}