From: Imre Deak <imre.deak@xxxxxxxxx> commit 873e5bb9fbd99e4a26c448b5c7af942a6d7aa60d upstream. Reporting a port as connected if nothing is attached to them leads to any i2c transactions on this port trying to use an uninitialized i2c adapter, fix this. Let's account for this case even if branch devices have no good reason to report a port as plugged with their peer device type set to 'none'. Fixes: db1a07956968 ("drm/dp_mst: Handle SST-only branch device case") Cc: Wayne Lin <Wayne.Lin@xxxxxxx> Cc: Lyude Paul <lyude@xxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> # v5.5+ Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx> Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx> Reported-by: Thiago Macieira <gitlab@xxxxxxxxxxxxxxxxxxxxxx> Link: https://patchwork.freedesktop.org/patch/msgid/20210201120145.350258-1-imre.deak@xxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/drm_dp_mst_topology.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -4224,6 +4224,7 @@ drm_dp_mst_detect_port(struct drm_connec switch (port->pdt) { case DP_PEER_DEVICE_NONE: + break; case DP_PEER_DEVICE_MST_BRANCHING: if (!port->mcs) ret = connector_status_connected;