Skip to content

Commit ca0d825

Browse files
ideakgregkh
authored andcommitted
drm/dp_mst: Don't cache EDIDs for physical ports
[ Upstream commit 4b8878e ] Caching EDIDs for physical ports prevents updating the EDID if a port gets reconnected via a Connection Status Notification message, fix this. Fixes: db1a079 ("drm/dp_mst: Handle SST-only branch device case") Cc: Wayne Lin <Wayne.Lin@amd.com> Cc: Lyude Paul <lyude@redhat.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210201120145.350258-2-imre.deak@intel.com (cherry picked from commit 4680915) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 141c939 commit ca0d825

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/drm_dp_mst_topology.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2302,7 +2302,8 @@ drm_dp_mst_port_add_connector(struct drm_dp_mst_branch *mstb,
23022302
}
23032303

23042304
if (port->pdt != DP_PEER_DEVICE_NONE &&
2305-
drm_dp_mst_is_end_device(port->pdt, port->mcs)) {
2305+
drm_dp_mst_is_end_device(port->pdt, port->mcs) &&
2306+
port->port_num >= DP_MST_LOGICAL_PORT_0) {
23062307
port->cached_edid = drm_get_edid(port->connector,
23072308
&port->aux.ddc);
23082309
drm_connector_set_tile_property(port->connector);

0 commit comments

Comments
 (0)