[Intel-gfx] [PATCH 58/71] drm/i915/chv: Register port D encoders and connectors

[Antti Koskipää]

For 50-58, with Jani's coding style fix:

Reviewed-by: Antti Koskipää <antti.koskipaa at linux.intel.com>

-- 
- Antti

On 04/09/2014 01:28 PM, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h      | 1 +
>  drivers/gpu/drm/i915/intel_display.c | 9 +++++++++
>  2 files changed, 10 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index a3957c7..4c0edb8 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -2435,6 +2435,7 @@ enum punit_power_well {
>  #define GEN3_SDVOC	0x61160
>  #define GEN4_HDMIB	GEN3_SDVOB
>  #define GEN4_HDMIC	GEN3_SDVOC
> +#define CHV_HDMID	0x6116C
>  #define PCH_SDVOB	0xe1140
>  #define PCH_HDMIB	PCH_SDVOB
>  #define PCH_HDMIC	0xe1150
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 798d91f..bf64e9d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11050,6 +11050,15 @@ static void intel_setup_outputs(struct drm_device *dev)
>  				intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C);
>  		}
>  
> +		if (IS_CHERRYVIEW(dev)) {
> +			if (I915_READ(VLV_DISPLAY_BASE + CHV_HDMID) & SDVO_DETECTED) {
> +				intel_hdmi_init(dev, VLV_DISPLAY_BASE + CHV_HDMID,
> +						PORT_D);
> +				if (I915_READ(VLV_DISPLAY_BASE + DP_D) & DP_DETECTED)
> +					intel_dp_init(dev, VLV_DISPLAY_BASE + DP_D, PORT_D);
> +			}
> +		}
> +
>  		intel_dsi_init(dev);
>  	} else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {
>  		bool found = false;
>