aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/0349-drm-amd-display-Get-rid-of-temp_flip_context.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/0349-drm-amd-display-Get-rid-of-temp_flip_context.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/0349-drm-amd-display-Get-rid-of-temp_flip_context.patch117
1 files changed, 0 insertions, 117 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/0349-drm-amd-display-Get-rid-of-temp_flip_context.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/0349-drm-amd-display-Get-rid-of-temp_flip_context.patch
deleted file mode 100644
index cfae0466..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.14.71/0349-drm-amd-display-Get-rid-of-temp_flip_context.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 6f257693cde5279cff72d4b8ecff193a277752b3 Mon Sep 17 00:00:00 2001
-From: Harry Wentland <harry.wentland@amd.com>
-Date: Thu, 6 Apr 2017 17:05:53 -0400
-Subject: [PATCH 0349/4131] drm/amd/display: Get rid of temp_flip_context
-
-If we need to update our context we can allocate memory.
-No need to keep temporary memory for this.
-
-Signed-off-by: Harry Wentland <harry.wentland@amd.com>
-Acked-by: Harry Wentland <Harry.Wentland@amd.com>
-Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/display/dc/core/dc.c | 26 +++++++++++++-------------
- drivers/gpu/drm/amd/display/dc/inc/core_dc.h | 1 -
- 2 files changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
-index 7b0b735..e8499e7 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
-@@ -409,8 +409,6 @@ static void destruct(struct core_dc *dc)
-
- dm_free(dc->current_context);
- dc->current_context = NULL;
-- dm_free(dc->temp_flip_context);
-- dc->temp_flip_context = NULL;
-
- dm_free(dc->ctx);
- dc->ctx = NULL;
-@@ -429,9 +427,8 @@ static bool construct(struct core_dc *dc,
- }
-
- dc->current_context = dm_alloc(sizeof(*dc->current_context));
-- dc->temp_flip_context = dm_alloc(sizeof(*dc->temp_flip_context));
-
-- if (!dc->current_context || !dc->temp_flip_context) {
-+ if (!dc->current_context) {
- dm_error("%s: failed to create validate ctx\n", __func__);
- goto val_ctx_fail;
- }
-@@ -874,13 +871,9 @@ bool dc_commit_streams(
- }
-
- resource_validate_ctx_destruct(core_dc->current_context);
-+ dm_free(core_dc->current_context);
-
-- if (core_dc->temp_flip_context != core_dc->current_context) {
-- dm_free(core_dc->temp_flip_context);
-- core_dc->temp_flip_context = core_dc->current_context;
-- }
- core_dc->current_context = context;
-- memset(core_dc->temp_flip_context, 0, sizeof(*core_dc->temp_flip_context));
-
- return (result == DC_OK);
-
-@@ -1212,7 +1205,7 @@ void dc_update_surfaces_and_stream(struct dc *dc,
- new_surfaces[i] = srf_updates[i].surface;
-
- /* initialize scratch memory for building context */
-- context = core_dc->temp_flip_context;
-+ context = dm_alloc(sizeof(*context));
- resource_validate_ctx_copy_construct(
- core_dc->current_context, context);
-
-@@ -1220,7 +1213,7 @@ void dc_update_surfaces_and_stream(struct dc *dc,
- if (!resource_attach_surfaces_to_context(
- new_surfaces, surface_count, dc_stream, context)) {
- BREAK_TO_DEBUGGER();
-- return;
-+ goto fail;
- }
- } else {
- context = core_dc->current_context;
-@@ -1326,7 +1319,7 @@ void dc_update_surfaces_and_stream(struct dc *dc,
- if (update_type == UPDATE_TYPE_FULL) {
- if (!core_dc->res_pool->funcs->validate_bandwidth(core_dc, context)) {
- BREAK_TO_DEBUGGER();
-- return;
-+ goto fail;
- } else
- core_dc->hwss.set_bandwidth(core_dc, context, false);
- }
-@@ -1418,10 +1411,17 @@ void dc_update_surfaces_and_stream(struct dc *dc,
-
- if (core_dc->current_context != context) {
- resource_validate_ctx_destruct(core_dc->current_context);
-- core_dc->temp_flip_context = core_dc->current_context;
-+ dm_free(core_dc->current_context);
-
- core_dc->current_context = context;
- }
-+ return;
-+
-+fail:
-+ if (core_dc->current_context != context) {
-+ resource_validate_ctx_destruct(context);
-+ dm_free(context);
-+ }
- }
-
- uint8_t dc_get_current_stream_count(const struct dc *dc)
-diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_dc.h b/drivers/gpu/drm/amd/display/dc/inc/core_dc.h
-index ec3edbe..f9363f6 100644
---- a/drivers/gpu/drm/amd/display/dc/inc/core_dc.h
-+++ b/drivers/gpu/drm/amd/display/dc/inc/core_dc.h
-@@ -22,7 +22,6 @@ struct core_dc {
- struct core_link *links[MAX_PIPES * 2];
-
- struct validate_context *current_context;
-- struct validate_context *temp_flip_context;
- struct resource_pool *res_pool;
-
- /* Display Engine Clock levels */
---
-2.7.4
-