---

yaml --- r: 318571 b: refs/heads/master c: 0b9f43a h: refs/heads/master i: 318569: a915a9c 318567: f4de55c v: v3
git-mirror · Jun 12, 2012 · 5bcdc9d · 5bcdc9d
1 parent ad503a3
commit 5bcdc9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24ded204429fa0f5501d37c63ee35c555c0b75ee
+refs/heads/master: 0b9f43a0ee7e89013a3d913ce556715fd8acb674
diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c
@@ -968,6 +968,8 @@ bool intel_lvds_init(struct drm_device *dev)
 	intel_encoder->clone_mask = (1 << INTEL_LVDS_CLONE_BIT);
 	if (HAS_PCH_SPLIT(dev))
 		intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
+	else if (IS_GEN4(dev))
+		intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
 	else
 		intel_encoder->crtc_mask = (1 << 1);