|
@@ -442,9 +442,9 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
|
|
|
|
|
|
drm_mode_connector_set_path_property(connector, pathprop);
|
|
|
drm_reinit_primary_mode_group(dev);
|
|
|
- mutex_lock(&dev->mode_config.mutex);
|
|
|
+ drm_modeset_lock_all(dev);
|
|
|
intel_connector_add_to_fbdev(intel_connector);
|
|
|
- mutex_unlock(&dev->mode_config.mutex);
|
|
|
+ drm_modeset_unlock_all(dev);
|
|
|
drm_connector_register(&intel_connector->base);
|
|
|
return connector;
|
|
|
}
|
|
@@ -455,16 +455,16 @@ 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;
|
|
|
/* need to nuke the connector */
|
|
|
- mutex_lock(&dev->mode_config.mutex);
|
|
|
+ drm_modeset_lock_all(dev);
|
|
|
intel_connector_dpms(connector, DRM_MODE_DPMS_OFF);
|
|
|
- mutex_unlock(&dev->mode_config.mutex);
|
|
|
+ drm_modeset_unlock_all(dev);
|
|
|
|
|
|
intel_connector->unregister(intel_connector);
|
|
|
|
|
|
- mutex_lock(&dev->mode_config.mutex);
|
|
|
+ drm_modeset_lock_all(dev);
|
|
|
intel_connector_remove_from_fbdev(intel_connector);
|
|
|
drm_connector_cleanup(connector);
|
|
|
- mutex_unlock(&dev->mode_config.mutex);
|
|
|
+ drm_modeset_unlock_all(dev);
|
|
|
|
|
|
drm_reinit_primary_mode_group(dev);
|
|
|
|