summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp.c
diff options
context:
space:
mode:
authorJani Nikula2015-05-18 16:10:01 +0200
committerDaniel Vetter2015-05-20 11:26:07 +0200
commit0c9b371550f40f8273a835f1e1055445cc3e2498 (patch)
tree36b2976f8b599075a2b2fe7fb7046da1331ea4ca /drivers/gpu/drm/i915/intel_dp.c
parentdrm/i915/dp: make link rate printing prettier (diff)
downloadkernel-qcow2-linux-0c9b371550f40f8273a835f1e1055445cc3e2498.tar.gz
kernel-qcow2-linux-0c9b371550f40f8273a835f1e1055445cc3e2498.tar.xz
kernel-qcow2-linux-0c9b371550f40f8273a835f1e1055445cc3e2498.zip
drm/i915: add HAS_DP_MST feature test macro
Be in line with other features that we have. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 6e9f14ef2d2d..0edc30516497 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5817,12 +5817,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
intel_dp_aux_init(intel_dp, intel_connector);
/* init MST on ports that can support it */
- if (IS_HASWELL(dev) || IS_BROADWELL(dev) || INTEL_INFO(dev)->gen >= 9) {
- if (port == PORT_B || port == PORT_C || port == PORT_D) {
- intel_dp_mst_encoder_init(intel_dig_port,
- intel_connector->base.base.id);
- }
- }
+ if (HAS_DP_MST(dev) &&
+ (port == PORT_B || port == PORT_C || port == PORT_D))
+ intel_dp_mst_encoder_init(intel_dig_port,
+ intel_connector->base.base.id);
if (!intel_edp_init_connector(intel_dp, intel_connector)) {
drm_dp_aux_unregister(&intel_dp->aux);