From: Harry Wentland <harry.wentland@amd.com>
Date: Sat, 5 Aug 2017 14:30:11 +0000 (-0400)
Subject: drm/amd/display: Use public plane destroy helper
X-Git-Tag: v4.15-rc1~56^2~23^2~201
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0627bbd30f87e06987cb38aee557b06414ae3735;p=thirdparty%2Fkernel%2Flinux.git

drm/amd/display: Use public plane destroy helper

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index b0fcfebc04b8b..3aab3d233a529 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2835,8 +2835,7 @@ void dm_drm_plane_destroy_state(struct drm_plane *plane,
 	if (dm_plane_state->dc_state)
 		dc_plane_state_release(dm_plane_state->dc_state);
 
-	__drm_atomic_helper_plane_destroy_state(state);
-	kfree(dm_plane_state);
+	drm_atomic_helper_plane_destroy_state(plane, state);
 }
 
 static const struct drm_plane_funcs dm_plane_funcs = {