[Intel-gfx] [PATCH 3/7] drm/i915: drop TVclock special casing on ilk+

[Jani Nikula]

On Tue, 30 Apr 2013, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> TV-out uses the same reference clock as everyone else. The only
> difference seems to be in the slightly different CB tuning limit.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index f10f094..317e055 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5629,9 +5629,6 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,
>  			if (intel_encoder->needs_tv_clock)
>  				is_tv = true;
>  			break;
> -		case INTEL_OUTPUT_TVOUT:
> -			is_tv = true;
> -			break;

An observation, this code path is actually dead code for ilk+, as is the
else if (is_tv) branch below. Good riddance.

>  		}
>  
>  		num_connectors++;
> @@ -5690,13 +5687,7 @@ static uint32_t ironlake_compute_dpll(struct intel_crtc *intel_crtc,
>  		break;
>  	}
>  
> -	if (is_sdvo && is_tv)
> -		dpll |= PLL_REF_INPUT_TVCLKINBC;

The commit message could reflect that this is actually a reserved value
in the register spec. With that bikeshed,

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

> -	else if (is_tv)
> -		/* XXX: just matching BIOS for now */
> -		/*	dpll |= PLL_REF_INPUT_TVCLKINBC; */
> -		dpll |= 3;
> -	else if (is_lvds && intel_panel_use_ssc(dev_priv) && num_connectors < 2)
> +	if (is_lvds && intel_panel_use_ssc(dev_priv) && num_connectors < 2)
>  		dpll |= PLLB_REF_INPUT_SPREADSPECTRUMIN;
>  	else
>  		dpll |= PLL_REF_INPUT_DREFCLK;
> -- 
> 1.7.11.7
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx