diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2010-01-11 16:38:32 -0500 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-01-15 17:13:18 -0500 |
commit | 6251ec0ae2eb9e9e96689422358c2fdb35c63768 (patch) | |
tree | 94e22bcd7941ccafd458d232048e5b8c0000c3aa | |
parent | 885a5fb5b120a5c7e0b3baad7b0feb5a89f76c18 (diff) |
drm/i915: fix eDP pipe mask
eDP could be on pipe A or B.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 184b6780c440..439506cefc14 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -1331,11 +1331,10 @@ intel_dp_init(struct drm_device *dev, int output_reg) | |||
1331 | else if (output_reg == DP_D || output_reg == PCH_DP_D) | 1331 | else if (output_reg == DP_D || output_reg == PCH_DP_D) |
1332 | intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT); | 1332 | intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT); |
1333 | 1333 | ||
1334 | if (IS_eDP(intel_output)) { | 1334 | if (IS_eDP(intel_output)) |
1335 | intel_output->crtc_mask = (1 << 1); | ||
1336 | intel_output->clone_mask = (1 << INTEL_EDP_CLONE_BIT); | 1335 | intel_output->clone_mask = (1 << INTEL_EDP_CLONE_BIT); |
1337 | } else | 1336 | |
1338 | intel_output->crtc_mask = (1 << 0) | (1 << 1); | 1337 | intel_output->crtc_mask = (1 << 0) | (1 << 1); |
1339 | connector->interlace_allowed = true; | 1338 | connector->interlace_allowed = true; |
1340 | connector->doublescan_allowed = 0; | 1339 | connector->doublescan_allowed = 0; |
1341 | 1340 | ||