Commit 3b24925e authored by Jani Nikula's avatar Jani Nikula

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/df957a1dfeddc14e4b62d6e2a1bf8104d506be87.1717514638.git.jani.nikula@intel.comSigned-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent c8f1392f
...@@ -2209,7 +2209,7 @@ ...@@ -2209,7 +2209,7 @@
* [10:1f] all * [10:1f] all
* [30:32] 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 SWF1(i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4)
#define SWF3(i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4) #define SWF3(i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)
#define SWF_ILK(i) _MMIO(0x4F000 + (i) * 4) #define SWF_ILK(i) _MMIO(0x4F000 + (i) * 4)
......
...@@ -40,7 +40,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv) ...@@ -40,7 +40,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)
/* Scratch space */ /* Scratch space */
if (GRAPHICS_VER(dev_priv) == 2 && IS_MOBILE(dev_priv)) { if (GRAPHICS_VER(dev_priv) == 2 && IS_MOBILE(dev_priv)) {
for (i = 0; i < 7; i++) { 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)); dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv, SWF1(i));
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
...@@ -50,7 +51,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv) ...@@ -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)); dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv, SWF1(i));
} else if (HAS_GMCH(dev_priv)) { } else if (HAS_GMCH(dev_priv)) {
for (i = 0; i < 16; i++) { 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)); dev_priv->regfile.saveSWF1[i] = intel_de_read(dev_priv, SWF1(i));
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
...@@ -65,7 +67,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv) ...@@ -65,7 +67,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)
/* Scratch space */ /* Scratch space */
if (GRAPHICS_VER(dev_priv) == 2 && IS_MOBILE(dev_priv)) { if (GRAPHICS_VER(dev_priv) == 2 && IS_MOBILE(dev_priv)) {
for (i = 0; i < 7; i++) { 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]); intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
...@@ -75,7 +78,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv) ...@@ -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]); intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
} else if (HAS_GMCH(dev_priv)) { } else if (HAS_GMCH(dev_priv)) {
for (i = 0; i < 16; i++) { 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]); intel_de_write(dev_priv, SWF1(i), dev_priv->regfile.saveSWF1[i]);
} }
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment