[PATCH 3/8] drm/i915: Extract intel_ddi_post_disable_hdmi_or_sst()

[Lisovskiy, Stanislav]

On Fri, Mar 01, 2024 at 04:35:55PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Extract the "not-MST" stuff from intel_ddi_post_disable() so that
> the whole thing isn't so cluttered.
> 
> The bigjoiner slave handling was outside of the !MST check,
> but it really should have been inside it as its the counterpart
> to the master handling inside the check. So we pull that
> in as well. There is no functional change here as we don't
> currently support bigjoiner+MST anyway.

Had same idea. Was really wondering why we handle it that way here.
But I guess for MST case, we need to add similar handling then?

Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy at intel.com>

> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c | 36 +++++++++++++++---------
>  1 file changed, 22 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 0e5834f8af6e..f3f8ecf1a87e 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3095,28 +3095,26 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state,
>  	intel_dp_dual_mode_set_tmds_output(intel_hdmi, false);
>  }
>  
> -static void intel_ddi_post_disable(struct intel_atomic_state *state,
> -				   struct intel_encoder *encoder,
> -				   const struct intel_crtc_state *old_master_crtc_state,
> -				   const struct drm_connector_state *old_conn_state)
> +static void intel_ddi_post_disable_hdmi_or_sst(struct intel_atomic_state *state,
> +					       struct intel_encoder *encoder,
> +					       const struct intel_crtc_state *old_master_crtc_state,
> +					       const struct drm_connector_state *old_conn_state)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  	struct intel_crtc *slave_crtc;
>  
> -	if (!intel_crtc_has_type(old_master_crtc_state, INTEL_OUTPUT_DP_MST)) {
> -		intel_crtc_vblank_off(old_master_crtc_state);
> +	intel_crtc_vblank_off(old_master_crtc_state);
>  
> -		intel_disable_transcoder(old_master_crtc_state);
> +	intel_disable_transcoder(old_master_crtc_state);
>  
> -		intel_ddi_disable_transcoder_func(old_master_crtc_state);
> +	intel_ddi_disable_transcoder_func(old_master_crtc_state);
>  
> -		intel_dsc_disable(old_master_crtc_state);
> +	intel_dsc_disable(old_master_crtc_state);
>  
> -		if (DISPLAY_VER(dev_priv) >= 9)
> -			skl_scaler_disable(old_master_crtc_state);
> -		else
> -			ilk_pfit_disable(old_master_crtc_state);
> -	}
> +	if (DISPLAY_VER(dev_priv) >= 9)
> +		skl_scaler_disable(old_master_crtc_state);
> +	else
> +		ilk_pfit_disable(old_master_crtc_state);
>  
>  	for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc,
>  					 intel_crtc_bigjoiner_slave_pipes(old_master_crtc_state)) {
> @@ -3128,6 +3126,16 @@ static void intel_ddi_post_disable(struct intel_atomic_state *state,
>  		intel_dsc_disable(old_slave_crtc_state);
>  		skl_scaler_disable(old_slave_crtc_state);
>  	}
> +}
> +
> +static void intel_ddi_post_disable(struct intel_atomic_state *state,
> +				   struct intel_encoder *encoder,
> +				   const struct intel_crtc_state *old_master_crtc_state,
> +				   const struct drm_connector_state *old_conn_state)
> +{
> +	if (!intel_crtc_has_type(old_master_crtc_state, INTEL_OUTPUT_DP_MST))
> +		intel_ddi_post_disable_hdmi_or_sst(state, encoder,
> +						   old_master_crtc_state, old_conn_state);
>  
>  	/*
>  	 * When called from DP MST code:
> -- 
> 2.43.0
>