drm/amd/display: Fix context copy memory leak

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>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 52077d3..4f93029 100644 (file)
--- 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(struct dc *dc, struct validate_context *c
 
        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: