History

drm/i915: fix mask bits setting

eDP is exclusive connector too, and add missing crtc_mask setting for TV. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=14139

Zhenyu Wang committed 17 years ago

Commit 7c8460d1 parent 3ff323f3 files · +3 −1Browse files

Unified · Split

3 files
  1. drivers/gpu/drm/i915/intel_dp.c +1 −1
  2. drivers/gpu/drm/i915/intel_drv.h +1 −0
  3. drivers/gpu/drm/i915/intel_tv.c +1 −0
drivers/gpu/drm/i915/intel_dp.c+1−1
@@ -1263,7 +1263,7 @@ intel_dp_init(struct drm_device *dev, int output_reg) · 1262 unmodified lines
12631263
12641264 if (IS_eDP(intel_output)) {
12651265 intel_output->crtc_mask = (1 << 1);
1266− intel_output->clone_mask = (1 << INTEL_OUTPUT_EDP);
1266+ intel_output->clone_mask = (1 << INTEL_EDP_CLONE_BIT);
12671267 } else
12681268 intel_output->crtc_mask = (1 << 0) | (1 << 1);
12691269 connector->interlace_allowed = true;
drivers/gpu/drm/i915/intel_drv.h+1−0
@@ -74,6 +74,7 @@ · 73 unmodified lines
7474 #define INTEL_LVDS_CLONE_BIT 14
7575 #define INTEL_DVO_TMDS_CLONE_BIT 15
7676 #define INTEL_DVO_LVDS_CLONE_BIT 16
77+#define INTEL_EDP_CLONE_BIT 17
7778
7879 #define INTEL_DVO_CHIP_NONE 0
7980 #define INTEL_DVO_CHIP_LVDS 1
drivers/gpu/drm/i915/intel_tv.c+1−0
@@ -1730,6 +1730,7 @@ intel_tv_init(struct drm_device *dev) · 1729 unmodified lines
17301730 drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc);
17311731 tv_priv = (struct intel_tv_priv *)(intel_output + 1);
17321732 intel_output->type = INTEL_OUTPUT_TVOUT;
1733+ intel_output->crtc_mask = (1 << 0) | (1 << 1);
17331734 intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT);
17341735 intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1));
17351736 intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);