Skip to contentSkip to conversation

drm/amdgpu/dm: Remove unneeded hotplug event in s3_handle_mst()

PATCH New Lyude Paul 1 participant 1 message Jul 18, 2019

Subsystems (3)
lore
Share & tools
lore

Lyude Paul

author
#0 lore raw

PATCH 1/1 drm/amdgpu/dm: Remove unneeded hotplug event in s3_handle_mst()

The DRM DP MST topology manager will send it's own hotplug events when connectors are destroyed, so there's no reason to send an additional hotplug event here.

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -5
index 0242d693f4f6..156eeacee2ae 100644
@@ -812,7 +812,6 @@ static void s3_handle_mst(struct drm_device *dev, bool suspend)
 	struct drm_connector *connector;
 	struct drm_dp_mst_topology_mgr *mgr;
 	int ret;
-	bool need_hotplug = false;
 
 	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
 
@@ -831,15 +830,15 @@ static void s3_handle_mst(struct drm_device *dev, bool suspend)
 			ret = drm_dp_mst_topology_mgr_resume(mgr);
 			if (ret < 0) {
 				drm_dp_mst_topology_mgr_set_mst(mgr, false);
-				need_hotplug = true;
+				mutex_lock(&aconnector->hpd_lock);
+				aconnector->dc_link->type =
+					dc_connection_single;
+				mutex_unlock(&aconnector->hpd_lock);
 			}
 		}
 	}
 
 	drm_modeset_unlock(&dev->mode_config.connection_mutex);
-
-	if (need_hotplug)
-		drm_kms_helper_hotplug_event(dev);
 }
 
 /**
Signature · 1 line
2.21.0