---

yaml --- r: 318580 b: refs/heads/master c: 14d94a3 h: refs/heads/master v: v3
git-mirror · Jun 13, 2012 · 7a3b553 · 7a3b553
1 parent c5f0ca8
commit 7a3b553
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93314b5b6f343f5a4c14c89d000007a754190c9a
+refs/heads/master: 14d94a3d82ab3ef6b3a9f881e134d5b48323b202
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -434,7 +434,7 @@ static bool is_dual_link_lvds(struct drm_i915_private *dev_priv,
 		 * register is uninitialized.
 		 */
 		val = I915_READ(reg);
-		if (!(val & ~LVDS_DETECTED))
+		if (!(val & ~(LVDS_PIPE_MASK | LVDS_DETECTED)))
 			val = dev_priv->bios_lvds_val;
 		dev_priv->lvds_val = val;
 	}