From: Lyude Paul Date: Tue, 29 Jan 2019 19:10:01 +0000 (-0500) Subject: drm/i915: Don't send hotplug in intel_dp_check_mst_status() X-Git-Tag: v5.1-rc1~23^2~17^2~11 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6cbb55c086b4f23ad100f34cdeab496c4e99e0a6;p=linux-2.6-block.git drm/i915: Don't send hotplug in intel_dp_check_mst_status() This hotplug also isn't needed: drm_dp_mst_topology_mgr_set_mst() already sends a hotplug on its own from drm_dp_destroy_connector_work() after destroying connectors in the MST topology. Signed-off-by: Lyude Paul Cc: Imre Deak Cc: Daniel Vetter Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20190129191001.442-4-lyude@redhat.com --- diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 26c8c0c747e7..8f38d932f2d1 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4614,12 +4614,10 @@ go_again: return ret; } else { - struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); DRM_DEBUG_KMS("failed to get ESI - device may have failed\n"); intel_dp->is_mst = false; - drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, intel_dp->is_mst); - /* send a hotplug event */ - drm_kms_helper_hotplug_event(intel_dig_port->base.base.dev); + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, + intel_dp->is_mst); } } return -EINVAL;