Merge tag 'v4.6-rc6' into locking/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index a2bd698fe2f7..937e77228466 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -506,6 +506,8 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
         struct intel_connector *intel_connector = to_intel_connector(connector);
         struct drm_device *dev = connector->dev;
 
+        intel_connector->unregister(intel_connector);
+
         /* need to nuke the connector */
         drm_modeset_lock_all(dev);
         if (connector->state->crtc) {
@@ -519,11 +521,7 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
 
                 WARN(ret, "Disabling mst crtc failed with %i\n", ret);
         }
-        drm_modeset_unlock_all(dev);
 
-        intel_connector->unregister(intel_connector);
-
-        drm_modeset_lock_all(dev);
         intel_connector_remove_from_fbdev(intel_connector);
         drm_connector_cleanup(connector);
         drm_modeset_unlock_all(dev);