[PATCH v2 6/8] drm/i915/pps: rename vlv_pps_init() to vlv_pps_port_enable()

[Ville Syrjälä]

On Mon, Sep 09, 2024 at 03:15:41PM +0300, Jani Nikula wrote:
> Follow the naming for vlv_pps_port_disable(), as these are counterparts.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/display/g4x_dp.c    | 2 +-
>  drivers/gpu/drm/i915/display/intel_pps.c | 5 +++--
>  drivers/gpu/drm/i915/display/intel_pps.h | 4 ++--
>  3 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c
> index e3db1cba11c9..796ec2244a4d 100644
> --- a/drivers/gpu/drm/i915/display/g4x_dp.c
> +++ b/drivers/gpu/drm/i915/display/g4x_dp.c
> @@ -690,7 +690,7 @@ static void intel_enable_dp(struct intel_atomic_state *state,
>  
>  	with_intel_pps_lock(intel_dp, wakeref) {
>  		if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
> -			vlv_pps_init(encoder, pipe_config);
> +			vlv_pps_port_enable(encoder, pipe_config);

The disable counterpart has the lock on the inside, so this could
do with an _unlocked() suffix to make the situation a bit clearer.

>  
>  		intel_dp_enable_port(intel_dp, pipe_config);
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
> index 33fae565588a..c91d14face20 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.c
> +++ b/drivers/gpu/drm/i915/display/intel_pps.c
> @@ -1227,8 +1227,9 @@ void vlv_pps_pipe_reset(struct intel_dp *intel_dp)
>  		intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);
>  }
>  
> -void vlv_pps_init(struct intel_encoder *encoder,
> -		  const struct intel_crtc_state *crtc_state)
> +/* Call on all DP, not just eDP */
> +void vlv_pps_port_enable(struct intel_encoder *encoder,
> +			 const struct intel_crtc_state *crtc_state)
>  {
>  	struct intel_display *display = to_intel_display(encoder);
>  	struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
> diff --git a/drivers/gpu/drm/i915/display/intel_pps.h b/drivers/gpu/drm/i915/display/intel_pps.h
> index 58df4cd3addd..b57a0c448e6c 100644
> --- a/drivers/gpu/drm/i915/display/intel_pps.h
> +++ b/drivers/gpu/drm/i915/display/intel_pps.h
> @@ -48,8 +48,8 @@ void intel_pps_reset_all(struct intel_display *display);
>  
>  void vlv_pps_pipe_init(struct intel_dp *intel_dp);
>  void vlv_pps_pipe_reset(struct intel_dp *intel_dp);
> -void vlv_pps_init(struct intel_encoder *encoder,
> -		  const struct intel_crtc_state *crtc_state);
> +void vlv_pps_port_enable(struct intel_encoder *encoder,
> +			 const struct intel_crtc_state *crtc_state);
>  void vlv_pps_port_disable(struct intel_encoder *encoder,
>  			  const struct intel_crtc_state *crtc_state);
>  
> -- 
> 2.39.2

-- 
Ville Syrjälä
Intel