[Intel-gfx] [PATCH 25/29] drm/i915: detect digital outputs on Haswell

[Chris Wilson]

On Fri, 13 Apr 2012 17:09:01 -0300, Eugeni Dodonov <eugeni.dodonov at intel.com> wrote:
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index bdc22f5..1524966 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -8743,26 +8743,45 @@ static void intel_setup_outputs(struct drm_device *dev)
>  	if (HAS_PCH_SPLIT(dev)) {
>  		int found;
>  
> -		if (I915_READ(HDMIB) & PORT_DETECTED) {
> -			/* PCH SDVOB multiplex with HDMIB */
> -			found = intel_sdvo_init(dev, PCH_SDVOB, true);
> -			if (!found)
> -				intel_hdmi_init(dev, HDMIB);
> -			if (!found && (I915_READ(PCH_DP_B) & DP_DETECTED))
> -				intel_dp_init(dev, PCH_DP_B);
> -		}
> +		if (IS_HASWELL(dev)) {

We're starting to get to ridiculous levels of indention. Break the PCH
detection of SDVO/HDMI outputs into its own routine, and perhaps further
down in architectures?
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre