From 5bcdc9dd50d4f5ce5bcb0990daa2292c760152e0 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 5 Jun 2012 10:07:11 +0200 Subject: [PATCH] --- yaml --- r: 318571 b: refs/heads/master c: 0b9f43a0ee7e89013a3d913ce556715fd8acb674 h: refs/heads/master i: 318569: a915a9c0be1652ba94f2ad5ad687c308fbeff519 318567: f4de55c45d1cdea1c6b0f0816eb9e63b60cfa96f v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 13dbc2a506e2..e7e12fe221ea 100644 --- 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 index 492db7740de2..ab4d64792616 100644 --- 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);