[Intel-gfx] [PATCH 05/13] drm/i915: Make skl_detach_scalers take crtc_state

[Ville Syrjälä]

On Wed, Oct 03, 2018 at 03:37:07PM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 91574abafb65..56784ae26369 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3502,13 +3502,13 @@ static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)
>  /*
>   * This function detaches (aka. unbinds) unused scalers in hardware
>   */
> -static void skl_detach_scalers(struct intel_crtc *intel_crtc)
> +static void skl_detach_scalers(const struct intel_crtc_state *crtc_state)
>  {
> -	struct intel_crtc_scaler_state *scaler_state;
> +	struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc);

s/intel_crtc/crtc/ looks easy enough to sneak in again.
Commit msg missing.

Otherwise
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> +	const struct intel_crtc_scaler_state *scaler_state =
> +		&crtc_state->scaler_state;
>  	int i;
>  
> -	scaler_state = &intel_crtc->config->scaler_state;
> -
>  	/* loop through and disable scalers that aren't in use */
>  	for (i = 0; i < intel_crtc->num_scalers; i++) {
>  		if (!scaler_state->scalers[i].in_use)
> @@ -3916,7 +3916,7 @@ static void intel_update_pipe_config(const struct intel_crtc_state *old_crtc_sta
>  
>  	/* on skylake this is done by detaching scalers */
>  	if (INTEL_GEN(dev_priv) >= 9) {
> -		skl_detach_scalers(crtc);
> +		skl_detach_scalers(new_crtc_state);
>  
>  		if (new_crtc_state->pch_pfit.enabled)
>  			skylake_pfit_enable(new_crtc_state);
> @@ -13335,7 +13335,7 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
>  	if (intel_cstate->update_pipe)
>  		intel_update_pipe_config(old_intel_cstate, intel_cstate);
>  	else if (INTEL_GEN(dev_priv) >= 9)
> -		skl_detach_scalers(intel_crtc);
> +		skl_detach_scalers(intel_cstate);
>  
>  out:
>  	if (dev_priv->display.atomic_update_watermarks)
> -- 
> 2.19.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel