1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e8f76be555df..1ef715303cc6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15355,6 +15355,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
                 WARN_ON(drm_atomic_set_mode_for_crtc(crtc->base.state, NULL) < 0);
                 crtc->base.state->active = crtc->active;
                 crtc->base.enabled = crtc->active;
+                crtc->base.state->connector_mask = 0;
 
                 /* Because we only establish the connector -> encoder ->
                  * crtc links if something is active, this means the
@@ -15557,7 +15558,21 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
         for_each_intel_connector(dev, connector) {
                 if (connector->get_hw_state(connector)) {
                         connector->base.dpms = DRM_MODE_DPMS_ON;
-                        connector->base.encoder = &connector->encoder->base;
+
+                        encoder = connector->encoder;
+                        connector->base.encoder = &encoder->base;
+
+                        if (encoder->base.crtc &&
+                            encoder->base.crtc->state->active) {
+                                /*
+                                 * This has to be done during hardware readout
+                                 * because anything calling .crtc_disable may
+                                 * rely on the connector_mask being accurate.
+                                 */
+                                encoder->base.crtc->state->connector_mask |=
+                                        1 << drm_connector_index(&connector->base);
+                        }
+
                 } else {
                         connector->base.dpms = DRM_MODE_DPMS_OFF;
                         connector->base.encoder = NULL;