[Intel-gfx] [PATCH 4/5] drm/i915/icl: keep track of unused pll while looping

[Paulo Zanoni]

Em qui, 2019-01-17 às 12:21 -0800, Lucas De Marchi escreveu:
> Instead of looping again on the range of plls, just keep track of one
> unused one and use it later.
> 

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dpll_mgr.c | 19 +++++++++----------
>  1 file changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> index 211b3ffa5bed..8f70838ac7d8 100644
> --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> @@ -247,7 +247,7 @@ intel_find_shared_dpll(struct intel_crtc *crtc,
>  		       enum intel_dpll_id range_max)
>  {
>  	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> -	struct intel_shared_dpll *pll;
> +	struct intel_shared_dpll *pll, *unused_pll = NULL;
>  	struct intel_shared_dpll_state *shared_dpll;
>  	enum intel_dpll_id i;
>  
> @@ -257,8 +257,10 @@ intel_find_shared_dpll(struct intel_crtc *crtc,
>  		pll = &dev_priv->shared_dplls[i];
>  
>  		/* Only want to check enabled timings first */
> -		if (shared_dpll[i].crtc_mask == 0)
> +		if (shared_dpll[i].crtc_mask == 0) {
> +			unused_pll = pll;
>  			continue;
> +		}
>  
>  		if (memcmp(&crtc_state->dpll_hw_state,
>  			   &shared_dpll[i].hw_state,
> @@ -273,14 +275,11 @@ intel_find_shared_dpll(struct intel_crtc *crtc,
>  	}
>  
>  	/* Ok no matching timings, maybe there's a free one? */
> -	for (i = range_min; i <= range_max; i++) {
> -		pll = &dev_priv->shared_dplls[i];
> -		if (shared_dpll[i].crtc_mask == 0) {
> -			DRM_DEBUG_KMS("[CRTC:%d:%s] allocated %s\n",
> -				      crtc->base.base.id, crtc->base.name,
> -				      pll->info->name);
> -			return pll;
> -		}
> +	if (unused_pll) {
> +		DRM_DEBUG_KMS("[CRTC:%d:%s] allocated %s\n",
> +			      crtc->base.base.id, crtc->base.name,
> +			      unused_pll->info->name);
> +		return unused_pll;
>  	}
>  
>  	return NULL;