--- /dev/null
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2024 Intel Corporation
+ */
+
+#include "i915_drv.h"
+#include "i915_reg.h"
+#include "i9xx_display_sr.h"
+#include "intel_de.h"
+#include "intel_gmbus.h"
+#include "intel_pci_config.h"
+
+static void i9xx_display_save_swf(struct drm_i915_private *i915)
+{
+       int i;
+
+       /* Scratch space */
+       if (GRAPHICS_VER(i915) == 2 && IS_MOBILE(i915)) {
+               for (i = 0; i < 7; i++) {
+                       i915->regfile.saveSWF0[i] = intel_de_read(i915, SWF0(i915, i));
+                       i915->regfile.saveSWF1[i] = intel_de_read(i915, SWF1(i915, i));
+               }
+               for (i = 0; i < 3; i++)
+                       i915->regfile.saveSWF3[i] = intel_de_read(i915, SWF3(i915, i));
+       } else if (GRAPHICS_VER(i915) == 2) {
+               for (i = 0; i < 7; i++)
+                       i915->regfile.saveSWF1[i] = intel_de_read(i915, SWF1(i915, i));
+       } else if (HAS_GMCH(i915)) {
+               for (i = 0; i < 16; i++) {
+                       i915->regfile.saveSWF0[i] = intel_de_read(i915, SWF0(i915, i));
+                       i915->regfile.saveSWF1[i] = intel_de_read(i915, SWF1(i915, i));
+               }
+               for (i = 0; i < 3; i++)
+                       i915->regfile.saveSWF3[i] = intel_de_read(i915, SWF3(i915, i));
+       }
+}
+
+static void i9xx_display_restore_swf(struct drm_i915_private *i915)
+{
+       int i;
+
+       /* Scratch space */
+       if (GRAPHICS_VER(i915) == 2 && IS_MOBILE(i915)) {
+               for (i = 0; i < 7; i++) {
+                       intel_de_write(i915, SWF0(i915, i), i915->regfile.saveSWF0[i]);
+                       intel_de_write(i915, SWF1(i915, i), i915->regfile.saveSWF1[i]);
+               }
+               for (i = 0; i < 3; i++)
+                       intel_de_write(i915, SWF3(i915, i), i915->regfile.saveSWF3[i]);
+       } else if (GRAPHICS_VER(i915) == 2) {
+               for (i = 0; i < 7; i++)
+                       intel_de_write(i915, SWF1(i915, i), i915->regfile.saveSWF1[i]);
+       } else if (HAS_GMCH(i915)) {
+               for (i = 0; i < 16; i++) {
+                       intel_de_write(i915, SWF0(i915, i), i915->regfile.saveSWF0[i]);
+                       intel_de_write(i915, SWF1(i915, i), i915->regfile.saveSWF1[i]);
+               }
+               for (i = 0; i < 3; i++)
+                       intel_de_write(i915, SWF3(i915, i), i915->regfile.saveSWF3[i]);
+       }
+}
+
+void i9xx_display_sr_save(struct drm_i915_private *i915)
+{
+       struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
+
+       if (!HAS_DISPLAY(i915))
+               return;
+
+       /* Display arbitration control */
+       if (GRAPHICS_VER(i915) <= 4)
+               i915->regfile.saveDSPARB = intel_de_read(i915, DSPARB(i915));
+
+       if (GRAPHICS_VER(i915) == 4)
+               pci_read_config_word(pdev, GCDGMBUS, &i915->regfile.saveGCDGMBUS);
+
+       i9xx_display_save_swf(i915);
+}
+
+void i9xx_display_sr_restore(struct drm_i915_private *i915)
+{
+       struct pci_dev *pdev = to_pci_dev(i915->drm.dev);
+
+       if (!HAS_DISPLAY(i915))
+               return;
+
+       i9xx_display_restore_swf(i915);
+
+       if (GRAPHICS_VER(i915) == 4)
+               pci_write_config_word(pdev, GCDGMBUS, i915->regfile.saveGCDGMBUS);
+
+       /* Display arbitration */
+       if (GRAPHICS_VER(i915) <= 4)
+               intel_de_write(i915, DSPARB(i915), i915->regfile.saveDSPARB);
+}
 
+++ /dev/null
-/*
- *
- * Copyright 2008 (c) Intel Corporation
- *   Jesse Barnes <jbarnes@virtuousgeek.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "display/intel_de.h"
-#include "display/intel_gmbus.h"
-
-#include "i915_drv.h"
-#include "i915_reg.h"
-#include "i915_suspend.h"
-#include "intel_pci_config.h"
-
-static void intel_save_swf(struct drm_i915_private *dev_priv)
-{
-       int i;
-
-       /* Scratch space */
-       if (GRAPHICS_VER(dev_priv) == 2 && IS_MOBILE(dev_priv)) {
-               for (i = 0; i < 7; i++) {
-                       dev_priv->regfile.saveSWF0[i] = intel_de_read(dev_priv,
-                                                                     SWF0(dev_priv, i));
-                       dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv,
-                                                                     SWF1(dev_priv, i));
-               }
-               for (i = 0; i < 3; i++)
-                       dev_priv->regfile.saveSWF3[i] = intel_de_read(dev_priv,
-                                                                     SWF3(dev_priv, i));
-       } else if (GRAPHICS_VER(dev_priv) == 2) {
-               for (i = 0; i < 7; i++)
-                       dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv,
-                                                                     SWF1(dev_priv, i));
-       } else if (HAS_GMCH(dev_priv)) {
-               for (i = 0; i < 16; i++) {
-                       dev_priv->regfile.saveSWF0[i] = intel_de_read(dev_priv,
-                                                                     SWF0(dev_priv, i));
-                       dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv,
-                                                                     SWF1(dev_priv, i));
-               }
-               for (i = 0; i < 3; i++)
-                       dev_priv->regfile.saveSWF3[i] = intel_de_read(dev_priv,
-                                                                     SWF3(dev_priv, i));
-       }
-}
-
-static void intel_restore_swf(struct drm_i915_private *dev_priv)
-{
-       int i;
-
-       /* Scratch space */
-       if (GRAPHICS_VER(dev_priv) == 2 && IS_MOBILE(dev_priv)) {
-               for (i = 0; i < 7; i++) {
-                       intel_de_write(dev_priv, SWF0(dev_priv, i),
-                                      dev_priv->regfile.saveSWF0[i]);
-                       intel_de_write(dev_priv, SWF1(dev_priv, i),
-                                      dev_priv->regfile.saveSWF1[i]);
-               }
-               for (i = 0; i < 3; i++)
-                       intel_de_write(dev_priv, SWF3(dev_priv, i),
-                                      dev_priv->regfile.saveSWF3[i]);
-       } else if (GRAPHICS_VER(dev_priv) == 2) {
-               for (i = 0; i < 7; i++)
-                       intel_de_write(dev_priv, SWF1(dev_priv, i),
-                                      dev_priv->regfile.saveSWF1[i]);
-       } else if (HAS_GMCH(dev_priv)) {
-               for (i = 0; i < 16; i++) {
-                       intel_de_write(dev_priv, SWF0(dev_priv, i),
-                                      dev_priv->regfile.saveSWF0[i]);
-                       intel_de_write(dev_priv, SWF1(dev_priv, i),
-                                      dev_priv->regfile.saveSWF1[i]);
-               }
-               for (i = 0; i < 3; i++)
-                       intel_de_write(dev_priv, SWF3(dev_priv, i),
-                                      dev_priv->regfile.saveSWF3[i]);
-       }
-}
-
-void i915_save_display(struct drm_i915_private *dev_priv)
-{
-       struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
-
-       if (!HAS_DISPLAY(dev_priv))
-               return;
-
-       /* Display arbitration control */
-       if (GRAPHICS_VER(dev_priv) <= 4)
-               dev_priv->regfile.saveDSPARB = intel_de_read(dev_priv,
-                                                            DSPARB(dev_priv));
-
-       if (GRAPHICS_VER(dev_priv) == 4)
-               pci_read_config_word(pdev, GCDGMBUS,
-                                    &dev_priv->regfile.saveGCDGMBUS);
-
-       intel_save_swf(dev_priv);
-}
-
-void i915_restore_display(struct drm_i915_private *dev_priv)
-{
-       struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
-
-       if (!HAS_DISPLAY(dev_priv))
-               return;
-
-       intel_restore_swf(dev_priv);
-
-       if (GRAPHICS_VER(dev_priv) == 4)
-               pci_write_config_word(pdev, GCDGMBUS,
-                                     dev_priv->regfile.saveGCDGMBUS);
-
-       /* Display arbitration */
-       if (GRAPHICS_VER(dev_priv) <= 4)
-               intel_de_write(dev_priv, DSPARB(dev_priv),
-                              dev_priv->regfile.saveDSPARB);
-}