From: Corbin McElhanney <corbin.mcelhanney@amd.com>
Date: Mon, 10 Jul 2017 15:52:10 -0400
Subject: drm/amd/display: Fix context copy memory leak
Git-commit: a85c205ae3d183c196d0af7df336b1315e95faf7
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
This change corrects an error introduced in 355f123f. Instead of
using the copy constructor to assign the new context, we swap the
pointer.
Signed-off-by: Corbin McElhanney <corbin.mcelhanney@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -972,7 +972,9 @@ static bool dc_commit_context_no_check(s
dc_enable_stereo(dc, context, dc_streams, context->stream_count);
- dc_resource_validate_ctx_copy_construct(context, core_dc->current_context);
+ dc_resource_validate_ctx_destruct(core_dc->current_context);
+ dm_free(core_dc->current_context);
+ core_dc->current_context = context;
return (result == DC_OK);
}
@@ -1057,9 +1059,6 @@ bool dc_commit_streams(
result = dc_commit_context_no_check(dc, context);
- dc_resource_validate_ctx_destruct(context);
- dm_free(context);
-
return (result == DC_OK);
fail: