kevin/linux
1
Fork 0
Code

drm/i915: pass dev_priv explicitly to SWF3

Browse Source 
Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the SWF3 register macro.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5ab27d6a4366617ba273e526a46a505c3d3c3295.1717514638.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2024-06-04 18:25:53 +03:00
parent eefd93d8f6
commit b9089184ba
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_reg.h
View File

@ -2211,7 +2211,7 @@
*/
#define SWF0(dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x70410 + (i) * 4)
#define SWF1(dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x71410 + (i) * 4)
#define SWF3(i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)
#define SWF3(dev_priv, i) _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x72414 + (i) * 4)
#define SWF_ILK(i) _MMIO(0x4F000 + (i) * 4)
/* Pipe B */

12
drivers/gpu/drm/i915/i915_suspend.c
View File

@ -46,7 +46,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)
SWF1(dev_priv, i));
}
for (i = 0; i < 3; i++)
dev_priv->regfile.saveSWF3[i] = intel_de_read(dev_priv, SWF3(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,
@ -59,7 +60,8 @@ static void intel_save_swf(struct drm_i915_private *dev_priv)
SWF1(dev_priv, i));
}
for (i = 0; i < 3; i++)
dev_priv->regfile.saveSWF3[i] = intel_de_read(dev_priv, SWF3(i));
dev_priv->regfile.saveSWF3[i] = intel_de_read(dev_priv,
SWF3(dev_priv, i));
}
}
@ -76,7 +78,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)
dev_priv->regfile.saveSWF1[i]);
}
for (i = 0; i < 3; i++)
intel_de_write(dev_priv, SWF3(i), dev_priv->regfile.saveSWF3[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),
@ -89,7 +92,8 @@ static void intel_restore_swf(struct drm_i915_private *dev_priv)
dev_priv->regfile.saveSWF1[i]);
}
for (i = 0; i < 3; i++)
intel_de_write(dev_priv, SWF3(i), dev_priv->regfile.saveSWF3[i]);
intel_de_write(dev_priv, SWF3(dev_priv, i),
dev_priv->regfile.saveSWF3[i]);
}
}