drm/i915/vga: Nuke vga_redisable_power_on()

Now that intel_vga_disable() itself will print a debug
message, intel_vga_redisable_power_on() is completely redundant.
Get rid of it.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250417114454.12836-6-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c
index 563a468f4537e501521b91463d04293d287de036..6335fa909a7b3460957b5195a399090102bd52f9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
@@ -1256,7 +1256,7 @@ static void vlv_display_power_well_init(struct intel_display *display)
                        intel_crt_reset(&encoder->base);
        }
 
-       intel_vga_redisable_power_on(display);
+       intel_vga_disable(display);
 
        intel_pps_unlock_regs_wa(display);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
index 508c69b91a76f5af6688e6c1de9c26a772b31988..21c1dbaf652d10dc71b057851fde69dfc10b09b9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vga.c
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
@@ -77,17 +77,6 @@ void intel_vga_disable(struct intel_display *display)
        intel_de_posting_read(display, vga_reg);
 }
 
-void intel_vga_redisable_power_on(struct intel_display *display)
-{
-       i915_reg_t vga_reg = intel_vga_cntrl_reg(display);
-
-       if (!(intel_de_read(display, vga_reg) & VGA_DISP_DISABLE)) {
-               drm_dbg_kms(display->drm,
-                           "Something enabled VGA plane, disabling it\n");
-               intel_vga_disable(display);
-       }
-}
-
 void intel_vga_redisable(struct intel_display *display)
 {
        intel_wakeref_t wakeref;
@@ -105,7 +94,7 @@ void intel_vga_redisable(struct intel_display *display)
        if (!wakeref)
                return;
 
-       intel_vga_redisable_power_on(display);
+       intel_vga_disable(display);
 
        intel_display_power_put(display, POWER_DOMAIN_VGA, wakeref);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h
index 824dfc32a1992772c573b58bf7dbf43377b78067..d0716782c1f97c9531c220fca86ff66af7683a71 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vga.h
+++ b/drivers/gpu/drm/i915/display/intel_vga.h
@@ -11,7 +11,6 @@ struct intel_display;
 void intel_vga_reset_io_mem(struct intel_display *display);
 void intel_vga_disable(struct intel_display *display);
 void intel_vga_redisable(struct intel_display *display);
-void intel_vga_redisable_power_on(struct intel_display *display);
 int intel_vga_register(struct intel_display *display);
 void intel_vga_unregister(struct intel_display *display);