Re: [PATCH 01/13] drm/i915/skl: Re-indent part of skl_ddi_calculate_wrpll()

[Daniel Vetter <daniel@ffwll.ch>]

On Thu, May 07, 2015 at 06:38:37PM +0100, Damien Lespiau wrote:
> A part of this function was indented with 2 tabs and 1 space instead of
> just 2 tabs. We're going to touch that code, so start by re-indenting
> it.
> 
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 64 ++++++++++++++++++++--------------------
>  1 file changed, 32 insertions(+), 32 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 9c1e74a..2e24fa4 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -1188,69 +1188,69 @@ found:
>  	if (min_dco_index > 2) {
>  		WARN(1, "No valid values found for the given pixel clock\n");
>  	} else {
> -		 wrpll_params->central_freq = dco_central_freq[min_dco_index];
> +		wrpll_params->central_freq = dco_central_freq[min_dco_index];
>  
> -		 switch (dco_central_freq[min_dco_index]) {
> -		 case 9600000000ULL:
> +		switch (dco_central_freq[min_dco_index]) {
> +		case 9600000000ULL:
>  			wrpll_params->central_freq = 0;
>  			break;
> -		 case 9000000000ULL:
> +		case 9000000000ULL:
>  			wrpll_params->central_freq = 1;
>  			break;
> -		 case 8400000000ULL:
> +		case 8400000000ULL:
>  			wrpll_params->central_freq = 3;
> -		 }
> +		}
>  
> -		 switch (candidate_p0[min_dco_index]) {
> -		 case 1:
> +		switch (candidate_p0[min_dco_index]) {
> +		case 1:
>  			wrpll_params->pdiv = 0;
>  			break;
> -		 case 2:
> +		case 2:
>  			wrpll_params->pdiv = 1;
>  			break;
> -		 case 3:
> +		case 3:
>  			wrpll_params->pdiv = 2;
>  			break;
> -		 case 7:
> +		case 7:
>  			wrpll_params->pdiv = 4;
>  			break;
> -		 default:
> +		default:
>  			WARN(1, "Incorrect PDiv\n");
> -		 }
> +		}
>  
> -		 switch (candidate_p2[min_dco_index]) {
> -		 case 5:
> +		switch (candidate_p2[min_dco_index]) {
> +		case 5:
>  			wrpll_params->kdiv = 0;
>  			break;
> -		 case 2:
> +		case 2:
>  			wrpll_params->kdiv = 1;
>  			break;
> -		 case 3:
> +		case 3:
>  			wrpll_params->kdiv = 2;
>  			break;
> -		 case 1:
> +		case 1:
>  			wrpll_params->kdiv = 3;
>  			break;
> -		 default:
> +		default:
>  			WARN(1, "Incorrect KDiv\n");
> -		 }
> +		}
>  
> -		 wrpll_params->qdiv_ratio = candidate_p1[min_dco_index];
> -		 wrpll_params->qdiv_mode =
> +		wrpll_params->qdiv_ratio = candidate_p1[min_dco_index];
> +		wrpll_params->qdiv_mode =
>  			(wrpll_params->qdiv_ratio == 1) ? 0 : 1;
>  
> -		 dco_freq = candidate_p0[min_dco_index] *
> -			 candidate_p1[min_dco_index] *
> -			 candidate_p2[min_dco_index] * afe_clock;
> +		dco_freq = candidate_p0[min_dco_index] *
> +			candidate_p1[min_dco_index] *
> +			candidate_p2[min_dco_index] * afe_clock;
>  
>  		/*
> -		* Intermediate values are in Hz.
> -		* Divide by MHz to match bsepc
> -		*/
> -		 wrpll_params->dco_integer = div_u64(dco_freq, (24 * MHz(1)));
> -		 wrpll_params->dco_fraction =
> -			 div_u64(((div_u64(dco_freq, 24) -
> -				   wrpll_params->dco_integer * MHz(1)) * 0x8000), MHz(1));
> +		 * Intermediate values are in Hz.
> +		 * Divide by MHz to match bsepc
> +		 */
> +		wrpll_params->dco_integer = div_u64(dco_freq, (24 * MHz(1)));
> +		wrpll_params->dco_fraction =
> +			div_u64(((div_u64(dco_freq, 24) -
> +				  wrpll_params->dco_integer * MHz(1)) * 0x8000), MHz(1));
>  
>  	}
>  }
> -- 
> 2.1.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx