drm/nouveau: Fix memory leak in nv50_mstm_del()

Commit Message

Lyude Paul Dec. 11, 2018, 11:56 p.m. UTC

Noticed this while working on redoing the reference counting scheme in
the DP MST helpers. Nouveau doesn't attempt to call
drm_dp_mst_topology_mgr_destroy() at all, which leaves it leaking all of
the resources for drm_dp_mst_topology_mgr and it's children mstbs+ports.

Fixes: f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream")
Signed-off-by: Lyude Paul <[e-mail]>
Cc: <[e-mail]> # v4.10+
---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Sasha Levin Dec. 12, 2018, 5:46 a.m. UTC | #1

Hi,

[This is an automated email]

This commit has been processed because it contains a "Fixes:" tag,
fixing commit: f479c0ba4a17 drm/nouveau/kms/nv50: initial support for DP 1.2 multi-stream.

The bot has tested the following trees: v4.19.8, v4.14.87, 

v4.19.8: Build OK!
v4.14.87: Failed to apply! Possible dependencies:
    Unable to calculate


How should we proceed with this patch?

--
Thanks,
Sasha

Lyude Paul Dec. 12, 2018, 5:40 p.m. UTC | #2

v4.19.8, it's ok to skip v4.14 for this

On Wed, 2018-12-12 at 05:46 +0000, Sasha Levin wrote:
> Hi,
> 
> [This is an automated email]
> 
> This commit has been processed because it contains a "Fixes:" tag,
> fixing commit: f479c0ba4a17 drm/nouveau/kms/nv50: initial support for DP 1.2
> multi-stream.
> 
> The bot has tested the following trees: v4.19.8, v4.14.87, 
> 
> v4.19.8: Build OK!
> v4.14.87: Failed to apply! Possible dependencies:
>     Unable to calculate
> 
> 
> How should we proceed with this patch?
> 
> --
> Thanks,
> Sasha

Patch

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index d153ea2a08ac..a634b3d0b6a1 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1254,6 +1254,7 @@  nv50_mstm_del(struct nv50_mstm **pmstm)
 {
 	struct nv50_mstm *mstm = *pmstm;
 	if (mstm) {
+		drm_dp_mst_topology_mgr_destroy(&mstm->mgr);
 		kfree(*pmstm);
 		*pmstm = NULL;
 	}