From: Eric Anholt <eric@anholt.net>
Date: Mon, 10 Oct 2016 16:44:06 +0000 (-0700)
Subject: drm/vc4: Fix memory leak of the CRTC state.
X-Git-Tag: Ubuntu-4.10.0-7.9~685^2~4^2~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7622b25543665567d8830a63210385b7d705924b;p=mirror_ubuntu-zesty-kernel.git

drm/vc4: Fix memory leak of the CRTC state.

The underscores variant frees the pointers inside, while the
no-underscores variant calls underscores and then frees the struct.

Signed-off-by: Eric Anholt <eric@anholt.net>
Fixes: d8dbf44f13b9 ("drm/vc4: Make the CRTCs cooperate on allocating display lists.")
Cc: stable@vger.kernel.org
---

diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index a0fd3e66bc4b..7aadce1f7e7a 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -839,7 +839,7 @@ static void vc4_crtc_destroy_state(struct drm_crtc *crtc,
 
 	}
 
-	__drm_atomic_helper_crtc_destroy_state(state);
+	drm_atomic_helper_crtc_destroy_state(crtc, state);
 }
 
 static const struct drm_crtc_funcs vc4_crtc_funcs = {