UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/display: Move resource_validate_ctx_destruct to dc.h 

This will be needed to clean up context once we add it to private
atomic state.

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-03-29 11:15:14 -04:00 committed by Alex Deucher
parent 927f6eff2a
commit 8122a253b3
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,7 +389,7 @@ static void allocate_dc_stream_funcs(struct core_dc *core_dc)
static void destruct(struct core_dc *dc) static void destruct(struct core_dc *dc)
{ {
resource_validate_ctx_destruct(dc->current_context); dc_resource_validate_ctx_destruct(dc->current_context);
destroy_links(dc); destroy_links(dc);
@ -654,7 +654,7 @@ bool dc_validate_resources(
result = core_dc->res_pool->funcs->validate_with_context( result = core_dc->res_pool->funcs->validate_with_context(
core_dc, set, set_count, context); core_dc, set, set_count, context);
resource_validate_ctx_destruct(context); dc_resource_validate_ctx_destruct(context);
dm_free(context); dm_free(context);
context_alloc_fail: context_alloc_fail:
@ -684,7 +684,7 @@ bool dc_validate_guaranteed(
result = core_dc->res_pool->funcs->validate_guaranteed( result = core_dc->res_pool->funcs->validate_guaranteed(
core_dc, stream, context); core_dc, stream, context);
resource_validate_ctx_destruct(context); dc_resource_validate_ctx_destruct(context);
dm_free(context); dm_free(context);
context_alloc_fail: context_alloc_fail:
@ -838,7 +838,7 @@ bool dc_commit_streams(
__func__, __func__,
result); result);
BREAK_TO_DEBUGGER(); BREAK_TO_DEBUGGER();
resource_validate_ctx_destruct(context); dc_resource_validate_ctx_destruct(context);
goto fail; goto fail;
} }
@ -870,7 +870,7 @@ bool dc_commit_streams(
context->streams[i]->public.timing.pix_clk_khz); context->streams[i]->public.timing.pix_clk_khz);
} }
resource_validate_ctx_destruct(core_dc->current_context); dc_resource_validate_ctx_destruct(core_dc->current_context);
dm_free(core_dc->current_context); dm_free(core_dc->current_context);
core_dc->current_context = context; core_dc->current_context = context;
@ -903,7 +903,7 @@ bool dc_post_update_surfaces_to_stream(struct dc *dc)
dm_error("%s: failed to create validate ctx\n", __func__); dm_error("%s: failed to create validate ctx\n", __func__);
return false; return false;
} }
resource_validate_ctx_copy_construct(core_dc->current_context, context); dc_resource_validate_ctx_copy_construct(core_dc->current_context, context);
post_surface_trace(dc); post_surface_trace(dc);
for (i = 0; i < context->res_ctx.pool->pipe_count; i++) for (i = 0; i < context->res_ctx.pool->pipe_count; i++)
@ -920,9 +920,9 @@ bool dc_post_update_surfaces_to_stream(struct dc *dc)
core_dc->hwss.set_bandwidth(core_dc, context, true); core_dc->hwss.set_bandwidth(core_dc, context, true);
resource_validate_ctx_copy_construct(context, core_dc->current_context); dc_resource_validate_ctx_copy_construct(context, core_dc->current_context);
resource_validate_ctx_destruct(context); dc_resource_validate_ctx_destruct(context);
dm_free(context); dm_free(context);
return true; return true;
@ -1205,7 +1205,7 @@ void dc_update_surfaces_and_stream(struct dc *dc,
/* initialize scratch memory for building context */ /* initialize scratch memory for building context */
context = dm_alloc(sizeof(*context)); context = dm_alloc(sizeof(*context));
resource_validate_ctx_copy_construct( dc_resource_validate_ctx_copy_construct(
core_dc->current_context, context); core_dc->current_context, context);
/* add surface to context */ /* add surface to context */
@ -1409,7 +1409,7 @@ void dc_update_surfaces_and_stream(struct dc *dc,
} }
if (core_dc->current_context != context) { if (core_dc->current_context != context) {
resource_validate_ctx_destruct(core_dc->current_context); dc_resource_validate_ctx_destruct(core_dc->current_context);
dm_free(core_dc->current_context); dm_free(core_dc->current_context);
core_dc->current_context = context; core_dc->current_context = context;
@ -1418,7 +1418,7 @@ void dc_update_surfaces_and_stream(struct dc *dc,
fail: fail:
if (core_dc->current_context != context) { if (core_dc->current_context != context) {
resource_validate_ctx_destruct(context); dc_resource_validate_ctx_destruct(context);
dm_free(context); dm_free(context);
} }
} }

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

@ -2050,7 +2050,7 @@ static void set_vsc_info_packet(
/*TODO: stereo 3D support and extend pixel encoding colorimetry*/ /*TODO: stereo 3D support and extend pixel encoding colorimetry*/
} }
void resource_validate_ctx_destruct(struct validate_context *context) void dc_resource_validate_ctx_destruct(struct validate_context *context)
{ {
int i, j; int i, j;
@ -2069,7 +2069,7 @@ void resource_validate_ctx_destruct(struct validate_context *context)
* Copy src_ctx into dst_ctx and retain all surfaces and streams referenced * Copy src_ctx into dst_ctx and retain all surfaces and streams referenced
* by the src_ctx * by the src_ctx
*/ */
void resource_validate_ctx_copy_construct( void dc_resource_validate_ctx_copy_construct(
const struct validate_context *src_ctx, const struct validate_context *src_ctx,
struct validate_context *dst_ctx) struct validate_context *dst_ctx)
{ {

6
drivers/gpu/drm/amd/display/dc/dc.h
View File

@ -522,6 +522,12 @@ bool dc_validate_guaranteed(
const struct dc *dc, const struct dc *dc,
const struct dc_stream *stream); const struct dc_stream *stream);
void dc_resource_validate_ctx_copy_construct(
const struct validate_context *src_ctx,
struct validate_context *dst_ctx);
void dc_resource_validate_ctx_destruct(struct validate_context *context);
/* /*
* Set up streams and links associated to drive sinks * Set up streams and links associated to drive sinks
* The streams parameter is an absolute set of all active streams. * The streams parameter is an absolute set of all active streams.

6
drivers/gpu/drm/amd/display/dc/inc/resource.h
View File

@ -141,12 +141,6 @@ void resource_validate_ctx_update_pointer_after_copy(
const struct validate_context *src_ctx, const struct validate_context *src_ctx,
struct validate_context *dst_ctx); struct validate_context *dst_ctx);
void resource_validate_ctx_copy_construct(
const struct validate_context *src_ctx,
struct validate_context *dst_ctx);
void resource_validate_ctx_destruct(struct validate_context *context);
enum dc_status resource_map_clock_resources( enum dc_status resource_map_clock_resources(
const struct core_dc *dc, const struct core_dc *dc,
struct validate_context *context); struct validate_context *context);