|
@@ -9884,7 +9884,13 @@ static void intel_setup_outputs(struct drm_device *dev)
|
|
|
if (I915_READ(PCH_DP_D) & DP_DETECTED)
|
|
|
intel_dp_init(dev, PCH_DP_D, PORT_D);
|
|
|
} else if (IS_VALLEYVIEW(dev)) {
|
|
|
- /* Check for built-in panel first. Shares lanes with HDMI on SDVOC */
|
|
|
+ if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIB) & SDVO_DETECTED) {
|
|
|
+ intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB,
|
|
|
+ PORT_B);
|
|
|
+ if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED)
|
|
|
+ intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B);
|
|
|
+ }
|
|
|
+
|
|
|
if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIC) & SDVO_DETECTED) {
|
|
|
intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC,
|
|
|
PORT_C);
|
|
@@ -9893,13 +9899,6 @@ static void intel_setup_outputs(struct drm_device *dev)
|
|
|
PORT_C);
|
|
|
}
|
|
|
|
|
|
- if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIB) & SDVO_DETECTED) {
|
|
|
- intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB,
|
|
|
- PORT_B);
|
|
|
- if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED)
|
|
|
- intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B);
|
|
|
- }
|
|
|
-
|
|
|
intel_dsi_init(dev);
|
|
|
} else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {
|
|
|
bool found = false;
|