drm/i915: pass dev_priv explicitly to SWF0

Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the SWF0 register macro.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/df957a1dfeddc14e4b62d6e2a1bf8104d506be87.1717514638.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 44e3f3bebfeee0d3756900985c4900b80bbdf572..574a171d29c98781771a3ca5f218ebaca62b8c90 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2209,7 +2209,7 @@
  * [10:1f] all
  * [30:32] all
  */
-#define SWF0(i)        _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4)
+#define SWF0(dev_priv, i)      _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4)
 #define SWF1(i)        _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4)
 #define SWF3(i)        _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)
 #define SWF_ILK(i)     _MMIO(0x4F000 + (i) * 4)

diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index bc449613c84861e741e107d0011aebe15092d9f0..ac8221ae97f3a7cace8764d050953aaff27985de 100644 (file)
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -40,7 +40,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)
        /* 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(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(i));
                }
                for (i = 0; i < 3; i++)
@@ -50,7 +51,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)
                        dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv, SWF1(i));
        } else if (HAS_GMCH(dev_priv)) {
                for (i = 0; i < 16; i++) {
-                       dev_priv->regfile.saveSWF0[i] = intel_de_read(dev_priv, SWF0(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(i));
                }
                for (i = 0; i < 3; i++)
@@ -65,7 +67,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)
        /* Scratch space */
        if (GRAPHICS_VER(dev_priv) == 2 && IS_MOBILE(dev_priv)) {
                for (i = 0; i < 7; i++) {
-                       intel_de_write(dev_priv, SWF0(i), dev_priv->regfile.saveSWF0[i]);
+                       intel_de_write(dev_priv, SWF0(dev_priv, i),
+                                      dev_priv->regfile.saveSWF0[i]);
                        intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
                }
                for (i = 0; i < 3; i++)
@@ -75,7 +78,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)
                        intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
        } else if (HAS_GMCH(dev_priv)) {
                for (i = 0; i < 16; i++) {
-                       intel_de_write(dev_priv, SWF0(i), dev_priv->regfile.saveSWF0[i]);
+                       intel_de_write(dev_priv, SWF0(dev_priv, i),
+                                      dev_priv->regfile.saveSWF0[i]);
                        intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
                }
                for (i = 0; i < 3; i++)