1 files changed, 0 insertions, 75 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0610-drm-amd-display-dc_validate_ctx-refocunt-fixes.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0610-drm-amd-display-dc_validate_ctx-refocunt-fixes.patch
deleted file mode 100644
index 1eab1bb6..00000000
--- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0610-drm-amd-display-dc_validate_ctx-refocunt-fixes.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 406d26fb3ea34c4d6682cd1672bf8df3530799ad Mon Sep 17 00:00:00 2001
-From: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
-Date: Tue, 11 Jul 2017 18:36:42 -0400
-Subject: [PATCH 0610/4131] drm/amd/display: dc_validate_ctx refocunt fixes.
-
-In dc_resource_validate_ctx_copy_construct don't override dst
-context refcount.
-
-Remove extra retain to new ctx in dc_update_surfaces_and_stream
-
-Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
-Reviewed-by: Tony Cheng <Tony.Cheng@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          | 5 +----
- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 5 +++++
- 2 files changed, 6 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 e81c9d5..8e580ac 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
-@@ -424,6 +424,7 @@ static void allocate_dc_stream_funcs(struct core_dc *core_dc)
- static void destruct(struct core_dc *dc)
- {
- 	dc_release_validate_context(dc->current_context);
-+	dc->current_context = NULL;
- 
- 	destroy_links(dc);
- 
-@@ -441,9 +442,6 @@ static void destruct(struct core_dc *dc)
- 	if (dc->ctx->logger)
- 		dal_logger_destroy(&dc->ctx->logger);
- 
--	dm_free(dc->current_context);
--	dc->current_context = NULL;
--
- 	dm_free(dc->ctx);
- 	dc->ctx = NULL;
- }
-@@ -1656,7 +1654,6 @@ void dc_update_surfaces_and_stream(struct dc *dc,
- 
- 	if (core_dc->current_context != context) {
- 		dc_release_validate_context(core_dc->current_context);
--		dc_retain_validate_context(context);
- 		core_dc->current_context = context;
- 	}
- 	return;
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-index cb02c7c..a9c086a 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-@@ -2166,6 +2166,7 @@ void dc_resource_validate_ctx_copy_construct(
- 		struct validate_context *dst_ctx)
- {
- 	int i, j;
-+	int ref_count = dst_ctx->ref_count;
- 
- 	*dst_ctx = *src_ctx;
- 
-@@ -2186,6 +2187,10 @@ void dc_resource_validate_ctx_copy_construct(
- 			dc_surface_retain(
- 				dst_ctx->stream_status[i].surfaces[j]);
- 	}
-+
-+	/* context refcount should not be overridden */
-+	dst_ctx->ref_count = ref_count;
-+
- }
- 
- struct clock_source *dc_resource_find_first_free_pll(
--- 
-2.7.4
-