Skip to contentSkip to conversation

drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy

PATCH In review Matt Roper 2 participants 2 messages Sep 25, 2019

Subsystems (2)
lore
Share & tools
lore

Matt Roper

author
#0 lore raw

PATCH 1/1 drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy

It looks like one of the topology manager mutexes may have been renamed during a rebase, but the destruction function wasn't updated with the new name:

error: ‘struct drm_dp_mst_topology_mgr’ has no member named ‘delayed_destroy_lock’

Fixes 50094b5dcd32 ("drm/dp_mst: Destroy topology_mgr mutexes")
Cc Lyude Paul <[email protected]>
Cc Sean Paul <[email protected]>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +1 -1
index 01d97c6cbbb2..c8804ca6264c 100644
@@ -4301,7 +4301,7 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr)
 	drm_atomic_private_obj_fini(&mgr->base);
 	mgr->funcs = NULL;
 
-	mutex_destroy(&mgr->delayed_destroy_lock);
+	mutex_destroy(&mgr->destroy_connector_lock);
 	mutex_destroy(&mgr->payload_lock);
 	mutex_destroy(&mgr->qlock);
 	mutex_destroy(&mgr->lock);
Signature · 6 lines
2.21.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 1/1
#1 lore raw

UGH this is entirely my fault, sorry about that. This reference got left in when I cherry-picked this patch from a different series.

Feel free to push right away

Quoted 30 lines · Matt Roper

It looks like one of the topology manager mutexes may have been renamed during a rebase, but the destruction function wasn't updated with the new name:

error: ‘struct drm_dp_mst_topology_mgr’ has no member named ‘delayed_destroy_lock’

Fixes 50094b5dcd32 ("drm/dp_mst: Destroy topology_mgr mutexes")
Cc Lyude Paul <[email protected]>
Cc Sean Paul <[email protected]>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_dp_mst_topology.c +1 -1
index 01d97c6cbbb2..c8804ca6264c 100644
@@ -4301,7 +4301,7 @@ void drm_dp_mst_topology_mgr_destroy(struct
 drm_dp_mst_topology_mgr *mgr)
 	drm_atomic_private_obj_fini(&mgr->base);
 	mgr->funcs = NULL;
 
-	mutex_destroy(&mgr->delayed_destroy_lock);
+	mutex_destroy(&mgr->destroy_connector_lock);
 	mutex_destroy(&mgr->payload_lock);
 	mutex_destroy(&mgr->qlock);

mutex_destroy(&mgr->lock);

Signature · 7 lines
Cheers,
	Lyude Paul

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel