Commit b1dee9a7 authored by David Francis's avatar David Francis Committed by Alex Deucher

drm/dp_mst: Fill branch->num_ports

This field on drm_dp_mst_branch was never filled

It is initialized to zero when the port is kzallocced.
When a port is added to the list, increment num_ports,
and when a port is removed from the list, decrement num_ports.

v2: remember to decrement on port removal
v3: don't explicitly init to 0
v4: move decrement of num_ports to unlink_port function
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarDavid Francis <David.Francis@amd.com>
Signed-off-by: default avatarMikita Lipski <mikita.lipski@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2f221a5e
...@@ -2175,6 +2175,7 @@ drm_dp_mst_topology_unlink_port(struct drm_dp_mst_topology_mgr *mgr, ...@@ -2175,6 +2175,7 @@ drm_dp_mst_topology_unlink_port(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_port *port) struct drm_dp_mst_port *port)
{ {
mutex_lock(&mgr->lock); mutex_lock(&mgr->lock);
port->parent->num_ports--;
list_del(&port->next); list_del(&port->next);
mutex_unlock(&mgr->lock); mutex_unlock(&mgr->lock);
drm_dp_mst_topology_put_port(port); drm_dp_mst_topology_put_port(port);
...@@ -2274,6 +2275,7 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, ...@@ -2274,6 +2275,7 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb,
mutex_lock(&mgr->lock); mutex_lock(&mgr->lock);
drm_dp_mst_topology_get_port(port); drm_dp_mst_topology_get_port(port);
list_add(&port->next, &mstb->ports); list_add(&port->next, &mstb->ports);
mstb->num_ports++;
mutex_unlock(&mgr->lock); mutex_unlock(&mgr->lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment