From 7c57782d480aecd86de11320e7772eafc772817a Mon Sep 17 00:00:00 2001 From: Mykola Lysenko Date: Wed, 9 Dec 2015 20:27:15 +0800 Subject: [PATCH 0601/1110] drm/amd/dal: use more robust locking for MST Used during connectors management Signed-off-by: Harry Wentland Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c index bd35d2e..ba1c854 100644 --- a/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c @@ -308,14 +308,14 @@ static void dm_dp_destroy_mst_connector( drm_connector_unregister(connector); /* need to nuke the connector */ - mutex_lock(&dev->mode_config.mutex); + drm_modeset_lock_all(dev); /* dpms off */ drm_fb_helper_remove_one_connector( &adev->mode_info.rfbdev->helper, connector); drm_connector_cleanup(connector); - mutex_unlock(&dev->mode_config.mutex); + drm_modeset_unlock_all(dev); kfree(connector); DRM_DEBUG_KMS("\n"); @@ -335,9 +335,9 @@ static void dm_dp_mst_register_connector(struct drm_connector *connector) struct drm_device *dev = connector->dev; struct amdgpu_device *adev = dev->dev_private; - mutex_lock(&dev->mode_config.mutex); + drm_modeset_lock_all(dev); drm_fb_helper_add_one_connector(&adev->mode_info.rfbdev->helper, connector); - mutex_unlock(&dev->mode_config.mutex); + drm_modeset_unlock_all(dev); drm_connector_register(connector); -- 2.7.4