[PATCH] drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy

[PATCH] drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy

[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 <lyude@redhat.com>
Cc: Sean Paul <sean@poorly.run>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
 drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 01d97c6cbbb2..c8804ca6264c 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -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);
-- 
2.21.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy

[Lyude Paul]

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

Reviewed-by: Lyude Paul <lyude@redhat.com>

Feel free to push right away

On Wed, 2019-09-25 at 15:46 -0700, Matt Roper wrote:
> 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 <lyude@redhat.com>
> Cc: Sean Paul <sean@poorly.run>
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
>  drivers/gpu/drm/drm_dp_mst_topology.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 01d97c6cbbb2..c8804ca6264c 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -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);
-- 
Cheers,
	Lyude Paul

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel