1 files changed, 45 insertions, 0 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0599-drm-amd-display-Fix-context-copy-memory-leak.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0599-drm-amd-display-Fix-context-copy-memory-leak.patch
new file mode 100644
index 00000000..a2a86e8b
--- /dev/null
+++ b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0599-drm-amd-display-Fix-context-copy-memory-leak.patch
@@ -0,0 +1,45 @@
+From 9cc2b741164a7b61e7bc8b2c1bed8cd20bcfdba9 Mon Sep 17 00:00:00 2001
+From: Corbin McElhanney <corbin.mcelhanney@amd.com>
+Date: Mon, 10 Jul 2017 15:52:10 -0400
+Subject: [PATCH 0599/4131] 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>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index 52077d39..4f93029 100644
+--- 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:
+-- 
+2.7.4
+