]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/i915: fix eDP pipe mask
authorZhenyu Wang <zhenyuw@linux.intel.com>
Mon, 11 Jan 2010 21:38:32 +0000 (05:38 +0800)
committerEric Anholt <eric@anholt.net>
Fri, 15 Jan 2010 22:13:18 +0000 (14:13 -0800)
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>
drivers/gpu/drm/i915/intel_dp.c

index 184b6780c440c66864ce1a52e6bfd3a8d39d27e9..439506cefc146c92afdece74e8c8a89476904c68 100644 (file)
@@ -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;