diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2010-01-12 05:38:32 +0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-01-15 14:13:18 -0800 |
| commit | 6251ec0ae2eb9e9e96689422358c2fdb35c63768 (patch) | |
| tree | 94e22bcd7941ccafd458d232048e5b8c0000c3aa /drivers/gpu | |
| parent | 885a5fb5b120a5c7e0b3baad7b0feb5a89f76c18 (diff) | |
| download | kernel_samsung_aries-6251ec0ae2eb9e9e96689422358c2fdb35c63768.zip kernel_samsung_aries-6251ec0ae2eb9e9e96689422358c2fdb35c63768.tar.gz kernel_samsung_aries-6251ec0ae2eb9e9e96689422358c2fdb35c63768.tar.bz2 | |
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>
Diffstat (limited to 'drivers/gpu')
| -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 184b678..439506c 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) else if (output_reg == DP_D || output_reg == PCH_DP_D) intel_output->clone_mask = (1 << INTEL_DP_D_CLONE_BIT); - if (IS_eDP(intel_output)) { - intel_output->crtc_mask = (1 << 1); + if (IS_eDP(intel_output)) intel_output->clone_mask = (1 << INTEL_EDP_CLONE_BIT); - } else - intel_output->crtc_mask = (1 << 0) | (1 << 1); + + intel_output->crtc_mask = (1 << 0) | (1 << 1); connector->interlace_allowed = true; connector->doublescan_allowed = 0; |