1
0
mirror of https://github.com/openbsd/src.git synced 2026-06-18 07:13:36 +02:00

Revert "drm/dp_mst: Skip validating ports during destruction, just ref"

From Lyude Paul
013b14652972949c5e8446b1e8ca9868780f5c7a in linux 4.19.y/4.19.114
9765635b30756eb74e05e260ac812659c296cd28 in mainline linux
This commit is contained in:
jsg
2020-04-03 09:57:07 +00:00
parent 3a5a2baaf5
commit c10c3c4ada
-16
View File
@@ -1024,25 +1024,9 @@ static struct drm_dp_mst_port *drm_dp_mst_get_port_ref_locked(struct drm_dp_mst_
static struct drm_dp_mst_port *drm_dp_get_validated_port_ref(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port)
{
struct drm_dp_mst_port *rport = NULL;
mutex_lock(&mgr->lock);
/*
* Port may or may not be 'valid' but we don't care about that when
* destroying the port and we are guaranteed that the port pointer
* will be valid until we've finished
*/
#ifdef notyet
if (current_work() == &mgr->destroy_connector_work) {
kref_get(&port->kref);
rport = port;
} else if (mgr->mst_primary) {
rport = drm_dp_mst_get_port_ref_locked(mgr->mst_primary,
port);
}
#else
if (mgr->mst_primary)
rport = drm_dp_mst_get_port_ref_locked(mgr->mst_primary, port);
#endif
mutex_unlock(&mgr->lock);
return rport;
}