diff options
| author | Imre Deak <imre.deak@intel.com> | 2024-01-04 10:30:05 +0200 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2024-01-08 18:57:21 +0200 |
| commit | bab87ef4db9aafeb8f95b7bfa5c12b187c01d13e (patch) | |
| tree | d6be18b4f6f3b416920220ddad177c35bc4e5ded /drivers/gpu/drm/i915/display/intel_dp_mst.c | |
| parent | drm/i915: Disable hotplug detection works during driver init/shutdown (diff) | |
| download | linux-bab87ef4db9aafeb8f95b7bfa5c12b187c01d13e.tar.gz linux-bab87ef4db9aafeb8f95b7bfa5c12b187c01d13e.zip | |
drm/i915: Disable hotplug detection handlers during driver init/shutdown
As described in the previous two patches an unexpected connector
detection can happen during the init/shutdown sequences. Prevent these
by returning the connector's current status from the detection handlers.
Link: https://patchwork.freedesktop.org/patch/msgid/20240104083008.2715733-10-imre.deak@intel.com
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 8a9432335030..5fa25a5a36b5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -37,6 +37,7 @@ #include "intel_crtc.h" #include "intel_ddi.h" #include "intel_de.h" +#include "intel_display_driver.h" #include "intel_display_types.h" #include "intel_dp.h" #include "intel_dp_hdcp.h" @@ -1410,6 +1411,9 @@ intel_dp_mst_detect(struct drm_connector *connector, if (drm_connector_is_unregistered(connector)) return connector_status_disconnected; + if (!intel_display_driver_check_access(i915)) + return connector->status; + return drm_dp_mst_detect_port(connector, ctx, &intel_dp->mst_mgr, intel_connector->port); } |