Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Backmerge to catch up with 4.3. slightly more involved conflict in the
irq code, but nothing beyond adjacent changes.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 677d70e4d363..ff8ba55853be 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -164,6 +164,11 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
                 return;
         }
 
+        /* MST encoders are bound to a crtc, not to a connector,
+         * force the mapping here for get_hw_state.
+         */
+        found->encoder = encoder;
+
         DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);
         intel_mst->port = found->port;
 
@@ -397,7 +402,7 @@ static const struct drm_encoder_funcs intel_dp_mst_enc_funcs = {
 
 static bool intel_dp_mst_get_hw_state(struct intel_connector *connector)
 {
-        if (connector->encoder) {
+        if (connector->encoder && connector->base.state->crtc) {
                 enum pipe pipe;
                 if (!connector->encoder->get_hw_state(connector->encoder, &pipe))
                         return false;