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

Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Reported-and-tested-by: Carlos R. Mafra <crmafra2@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Zhenyu Wang and committed by Linus Torvalds 7c8460db 3ff323f8

+3 -1
+1 -1
drivers/gpu/drm/i915/intel_dp.c
··· 1263 1264 if (IS_eDP(intel_output)) { 1265 intel_output->crtc_mask = (1 << 1); 1266 - intel_output->clone_mask = (1 << INTEL_OUTPUT_EDP); 1267 } else 1268 intel_output->crtc_mask = (1 << 0) | (1 << 1); 1269 connector->interlace_allowed = true;
··· 1263 1264 if (IS_eDP(intel_output)) { 1265 intel_output->crtc_mask = (1 << 1); 1266 + intel_output->clone_mask = (1 << INTEL_EDP_CLONE_BIT); 1267 } else 1268 intel_output->crtc_mask = (1 << 0) | (1 << 1); 1269 connector->interlace_allowed = true;
+1
drivers/gpu/drm/i915/intel_drv.h
··· 74 #define INTEL_LVDS_CLONE_BIT 14 75 #define INTEL_DVO_TMDS_CLONE_BIT 15 76 #define INTEL_DVO_LVDS_CLONE_BIT 16 77 78 #define INTEL_DVO_CHIP_NONE 0 79 #define INTEL_DVO_CHIP_LVDS 1
··· 74 #define INTEL_LVDS_CLONE_BIT 14 75 #define INTEL_DVO_TMDS_CLONE_BIT 15 76 #define INTEL_DVO_LVDS_CLONE_BIT 16 77 + #define INTEL_EDP_CLONE_BIT 17 78 79 #define INTEL_DVO_CHIP_NONE 0 80 #define INTEL_DVO_CHIP_LVDS 1
+1
drivers/gpu/drm/i915/intel_tv.c
··· 1730 drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc); 1731 tv_priv = (struct intel_tv_priv *)(intel_output + 1); 1732 intel_output->type = INTEL_OUTPUT_TVOUT; 1733 intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT); 1734 intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1)); 1735 intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);
··· 1730 drm_mode_connector_attach_encoder(&intel_output->base, &intel_output->enc); 1731 tv_priv = (struct intel_tv_priv *)(intel_output + 1); 1732 intel_output->type = INTEL_OUTPUT_TVOUT; 1733 + intel_output->crtc_mask = (1 << 0) | (1 << 1); 1734 intel_output->clone_mask = (1 << INTEL_TV_CLONE_BIT); 1735 intel_output->enc.possible_crtcs = ((1 << 0) | (1 << 1)); 1736 intel_output->enc.possible_clones = (1 << INTEL_OUTPUT_TVOUT);