Re: [PATCH 5/6] drm/i915/vga: Nuke vga_redisable_power_on()

[Jani Nikula <jani.nikula@linux.intel.com>]

On Thu, 17 Apr 2025, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Now that intel_vga_disable() itself will print a debug
> message, intel_vga_redisable_power_on() is completely redudant.

*redundant

Reviewed-by: Jani Nikula <jani.nikula@intel.com>


> Get rid of it.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  .../gpu/drm/i915/display/intel_display_power_well.c |  2 +-
>  drivers/gpu/drm/i915/display/intel_vga.c            | 13 +------------
>  drivers/gpu/drm/i915/display/intel_vga.h            |  1 -
>  3 files changed, 2 insertions(+), 14 deletions(-)
>
> 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 b9b4359751cc..9641fb5b846b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
> @@ -1252,7 +1252,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 7ee689a9da92..d01de61105c1 100644
> --- a/drivers/gpu/drm/i915/display/intel_vga.c
> +++ b/drivers/gpu/drm/i915/display/intel_vga.c
> @@ -74,17 +74,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;
> @@ -102,7 +91,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 824dfc32a199..d0716782c1f9 100644
> --- 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);

-- 
Jani Nikula, Intel