---

yaml --- r: 358050 b: refs/heads/master c: 9d5f78f h: refs/heads/master v: v3
git-mirror · Jan 26, 2013 · 7df16f6 · 7df16f6
1 parent 2d1dcfd
commit 7df16f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca54b8107f6ad8c161fa102920dd70dfef19cd2e
+refs/heads/master: 9d5f78fbbf924492001ac7b2915537968906e517
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -8227,18 +8227,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)) {
-		int found;
-
 		/* Check for built-in panel first. Shares lanes with HDMI on SDVOC */
 		if (I915_READ(DP_C) & DP_DETECTED)
 			intel_dp_init(dev, DP_C, PORT_C);
 
 		if (I915_READ(SDVOB) & PORT_DETECTED) {
-			/* SDVOB multiplex with HDMIB */
-			found = intel_sdvo_init(dev, SDVOB, true);
-			if (!found)
-				intel_hdmi_init(dev, SDVOB, PORT_B);
-			if (!found && (I915_READ(DP_B) & DP_DETECTED))
+			intel_hdmi_init(dev, SDVOB, PORT_B);
+			if (I915_READ(DP_B) & DP_DETECTED)
 				intel_dp_init(dev, DP_B, PORT_B);
 		}