diff options
authorVille Syrjälä <>2019-09-03 18:40:18 +0300
committerRodrigo Vivi <>2019-10-03 12:23:07 -0700
commit485f682be9fc8d41376936a3b01423edd07b9a75 (patch)
parenteb0192fed016db1c5a9701cd6ca47233ff4a43e5 (diff)
Revert "drm/i915: Fix DP-MST crtc_mask"
This reverts commit 4eaceea3a00f8e936a7f48dcd0c975a57f88930f. Several userspace clients (modesetting ddx and mutter+wayland at least) handle encoder.possible_crtcs incorrectly. What they essentially do is the following: possible_crtcs = ~0; for_each_possible_encoder(connector) possible_crtcs &= encoder->possible_crtcs; Ie. they calculate the intersection of the possible_crtcs for the connector when they really should be calculating the union instead. In our case each MST encoder now has just one unique bit set, and so the intersection is always zero. The end result is that MST connectors can't be lit up because no crtc can be found to drive them. I've submitted a fix for the modesetting ddx [1], and complained on #wayland about mutter, so hopefully the situation will improve in the future. In the meantime we have regression, and so must go back to the old way of misconfiguring possible_crtcs in the kernel. [1] Cc: Jonas Ådahl <> Cc: Stanislav Lisovskiy <> Cc: Lionel Landwerlin <> Cc: Dhinakaran Pandiyan <> Cc: Lucas De Marchi <> Bugzilla: Signed-off-by: Ville Syrjälä <> Link: Reviewed-by: José Roberto de Souza <> (cherry picked from commit e838bfa8e170415fa3cc8e83ecb171e809c0c422) Signed-off-by: Rodrigo Vivi <>
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index b6e3504c80a4..600873c796d0 100644
@@ -615,7 +615,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
intel_encoder->type = INTEL_OUTPUT_DP_MST;
intel_encoder->power_domain = intel_dig_port->base.power_domain;
intel_encoder->port = intel_dig_port->base.port;
- intel_encoder->crtc_mask = BIT(pipe);
+ intel_encoder->crtc_mask = 0x7;
intel_encoder->cloneable = 0;
intel_encoder->compute_config = intel_dp_mst_compute_config;