diff options
| author |   Lyude Paul <lyude@redhat.com> | 2019-01-29 14:10:01 -0500 |
|---|---|---|
| committer | Lyude Paul <lyude@redhat.com> | 2019-02-06 14:54:27 -0500 |
| commit | 6cbb55c086b4f23ad100f34cdeab496c4e99e0a6 (patch) | |
| tree | ce498f6f07f8cb8fd205af0563960b27a7e601c0 /drivers/gpu/drm/i915 | |
| parent | drm/i915: Don't send MST hotplugs during resume (diff) | |
| download | linux-dev-6cbb55c086b4f23ad100f34cdeab496c4e99e0a6.tar.xz linux-dev-6cbb55c086b4f23ad100f34cdeab496c4e99e0a6.zip | |
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 <lyude@redhat.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190129191001.442-4-lyude@redhat.com
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; |