[Intel-gfx] [CI 1/3] drm/i915/vga: rename intel_vga_msr_write() to intel_vga_reset_io_mem()

Jani Nikula jani.nikula at intel.com
Fri Oct 4 12:20:17 UTC 2019


Rename the function per Ville's suggestion. No functional changes.

Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
Suggested-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_power.c | 2 +-
 drivers/gpu/drm/i915/display/intel_vga.c           | 2 +-
 drivers/gpu/drm/i915/display/intel_vga.h           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index bb642a1a0dd4..0616284c6da6 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -267,7 +267,7 @@ static void hsw_power_well_post_enable(struct drm_i915_private *dev_priv,
 				       u8 irq_pipe_mask, bool has_vga)
 {
 	if (has_vga)
-		intel_vga_msr_write(dev_priv);
+		intel_vga_reset_io_mem(dev_priv);
 
 	if (irq_pipe_mask)
 		gen8_irq_power_well_post_enable(dev_priv, irq_pipe_mask);
diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
index 732568eaa988..2ff7293986d4 100644
--- a/drivers/gpu/drm/i915/display/intel_vga.c
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
@@ -72,7 +72,7 @@ void intel_vga_redisable(struct drm_i915_private *i915)
 	intel_display_power_put(i915, POWER_DOMAIN_VGA, wakeref);
 }
 
-void intel_vga_msr_write(struct drm_i915_private *i915)
+void intel_vga_reset_io_mem(struct drm_i915_private *i915)
 {
 	struct pci_dev *pdev = i915->drm.pdev;
 
diff --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h
index 3517872e62ac..ba5b55b917f0 100644
--- a/drivers/gpu/drm/i915/display/intel_vga.h
+++ b/drivers/gpu/drm/i915/display/intel_vga.h
@@ -8,7 +8,7 @@
 
 struct drm_i915_private;
 
-void intel_vga_msr_write(struct drm_i915_private *i915);
+void intel_vga_reset_io_mem(struct drm_i915_private *i915);
 void intel_vga_disable(struct drm_i915_private *i915);
 void intel_vga_redisable(struct drm_i915_private *i915);
 void intel_vga_redisable_power_on(struct drm_i915_private *i915);
-- 
2.20.1



More information about the Intel-gfx mailing list