|
@@ -502,6 +502,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 intel_connector *intel_connector = to_intel_connector(connector);
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_device *dev = connector->dev;
|
|
|
|
|
|
|
|
+ intel_connector->unregister(intel_connector);
|
|
|
|
+
|
|
/* need to nuke the connector */
|
|
/* need to nuke the connector */
|
|
drm_modeset_lock_all(dev);
|
|
drm_modeset_lock_all(dev);
|
|
if (connector->state->crtc) {
|
|
if (connector->state->crtc) {
|
|
@@ -515,11 +517,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);
|
|
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);
|
|
intel_connector_remove_from_fbdev(intel_connector);
|
|
drm_connector_cleanup(connector);
|
|
drm_connector_cleanup(connector);
|
|
drm_modeset_unlock_all(dev);
|
|
drm_modeset_unlock_all(dev);
|