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.

Signed-off-by: Lyude Paul <ly...@redhat.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 0242d693f4f6..156eeacee2ae 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -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);
 }
 
 /**
-- 
2.21.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to