diff options
| author | Ville Syrjälä | 2014-04-09 12:28:56 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-05-20 15:33:08 +0200 |
| commit | 9418c1f1760c91ae1a8947b0da383f3082799b19 (patch) | |
| tree | 35720d00bcaf5658aa8753c03cb380a4bdffaff7 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915/chv: Fix PORT_TO_PIPE for CHV (diff) | |
| download | kernel-qcow2-linux-9418c1f1760c91ae1a8947b0da383f3082799b19.tar.gz kernel-qcow2-linux-9418c1f1760c91ae1a8947b0da383f3082799b19.tar.xz kernel-qcow2-linux-9418c1f1760c91ae1a8947b0da383f3082799b19.zip | |
drm/i915/chv: Register port D encoders and connectors
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Antti Koskipää <antti.koskipaa@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a68dcce6ac39..77a29f33b56f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11053,6 +11053,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; |