From f36cc577c3254738e370b553f9f8cedf2df84070 Mon Sep 17 00:00:00 2001 From: Bhawanpreet Lakha Date: Mon, 28 Aug 2017 12:04:23 -0400 Subject: [PATCH] drm/amd/display: Rename dc resource_validate_ctx methods Rename dc_resource methods from validate_ctx to state Signed-off-by: Bhawanpreet Lakha Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 6 +++--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 ++++---- drivers/gpu/drm/amd/display/dc/dc.h | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 9b018115d97e..4c7515d9c811 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4651,7 +4651,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, dm_state->context = dc_create_state(); ASSERT(dm_state->context); - dc_resource_validate_ctx_copy_construct_current(dc, dm_state->context); + dc_resource_state_copy_construct_current(dc, dm_state->context); /* Remove exiting planes if they are modified */ ret = dm_update_planes_state(dc, state, false, &lock_and_validation_needed); diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 53f814dcc24d..6bf8af7a592d 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1022,7 +1022,7 @@ void dc_release_state(struct dc_state *context) atomic_dec(&context->ref_count); if (atomic_read(&context->ref_count) == 0) { - dc_resource_validate_ctx_destruct(context); + dc_resource_state_destruct(context); dm_free(context); } } @@ -1292,7 +1292,7 @@ void dc_update_planes_and_stream(struct dc *dc, if (context == NULL) goto context_alloc_fail; - dc_resource_validate_ctx_copy_construct( + dc_resource_state_copy_construct( dc->current_state, context); /*remove old surfaces from context */ @@ -1635,7 +1635,7 @@ void dc_set_power_state( /* Preserve refcount */ ref_count = dc->current_state->ref_count; - dc_resource_validate_ctx_destruct(dc->current_state); + dc_resource_state_destruct(dc->current_state); memset(dc->current_state, 0, sizeof(*dc->current_state)); dc->current_state->ref_count = ref_count; 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 727afeaa3830..d284d9d40e2b 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1707,11 +1707,11 @@ void validate_guaranteed_copy_streams( } } -void dc_resource_validate_ctx_copy_construct_current( +void dc_resource_state_copy_construct_current( const struct dc *dc, struct dc_state *dst_ctx) { - dc_resource_validate_ctx_copy_construct(dc->current_state, dst_ctx); + dc_resource_state_copy_construct(dc->current_state, dst_ctx); } bool dc_validate_global_state( @@ -2413,7 +2413,7 @@ static void set_vsc_info_packet( /*TODO: stereo 3D support and extend pixel encoding colorimetry*/ } -void dc_resource_validate_ctx_destruct(struct dc_state *context) +void dc_resource_state_destruct(struct dc_state *context) { int i, j; @@ -2432,7 +2432,7 @@ void dc_resource_validate_ctx_destruct(struct dc_state *context) * Copy src_ctx into dst_ctx and retain all surfaces and streams referenced * by the src_ctx */ -void dc_resource_validate_ctx_copy_construct( +void dc_resource_state_copy_construct( const struct dc_state *src_ctx, struct dc_state *dst_ctx) { diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h index d1d5737398df..f3ccc2043405 100644 --- a/drivers/gpu/drm/amd/display/dc/dc.h +++ b/drivers/gpu/drm/amd/display/dc/dc.h @@ -679,15 +679,15 @@ bool dc_validate_global_state( * No hardware is programmed for call. Only validation is done. */ -void dc_resource_validate_ctx_copy_construct( +void dc_resource_state_copy_construct( const struct dc_state *src_ctx, struct dc_state *dst_ctx); -void dc_resource_validate_ctx_copy_construct_current( +void dc_resource_state_copy_construct_current( const struct dc *dc, struct dc_state *dst_ctx); -void dc_resource_validate_ctx_destruct(struct dc_state *context); +void dc_resource_state_destruct(struct dc_state *context); /* * TODO update to make it about validation sets -- 2.45.2