mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drm/amd/display: fix up construction of scratch_val_ctx 

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Dmytro Laktyushkin 2016-12-05 18:03:04 -05:00 committed by Alex Deucher
parent 922aa1e15e
commit 5ea81b9185
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -450,11 +450,6 @@ static void destruct(struct core_dc *dc)
{
resource_validate_ctx_destruct(dc->current_context);
dm_free(dc->temp_flip_context);
dc->temp_flip_context = NULL;
dm_free(dc->scratch_val_ctx);
dc->scratch_val_ctx = NULL;
destroy_links(dc);
dc_destroy_resource_pool(dc);
@ -473,6 +468,10 @@ 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->scratch_val_ctx);
dc->scratch_val_ctx = NULL;
dm_free(dc->ctx);
dc->ctx = NULL;
@ -492,7 +491,7 @@ 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));
dc->scratch_val_ctx = dm_alloc(sizeof(*dc->temp_flip_context));
dc->scratch_val_ctx = dm_alloc(sizeof(*dc->scratch_val_ctx));
if (!dc->current_context || !dc->temp_flip_context) {
dm_error("%s: failed to create validate ctx\n", __func__);
@ -1220,6 +1219,7 @@ bool dc_pre_update_surfaces_to_target(
goto unexpected_fail;
}
resource_validate_ctx_destruct(context);
ASSERT(core_dc->scratch_val_ctx == temp_context);
core_dc->scratch_val_ctx = context;
context = temp_context;
}

2
drivers/gpu/drm/amd/display/dc/inc/core_types.h
View File

@ -312,7 +312,7 @@ struct validate_context {
/* The output from BW and WM calculations. */
struct bw_calcs_output bw_results;
/* Note: this is a big structure, do *not* put on stack! */
/* Note: these are big structures, do *not* put on stack! */
struct dm_pp_display_configuration pp_display_cfg;
};