mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 18:13:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/display: Get rid of temp_flip_context

Browse Source 
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>
This commit is contained in:
Harry Wentland
2017-04-06 17:05:53 -04:00
committed by Alex Deucher
parent 03e4173b44
commit 6d9501e4ad
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)

1
drivers/gpu/drm/amd/display/dc/inc/core_dc.h
View File

@@ -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 */