From: Bhawanpreet Lakha <[email protected]> Rename dc_resource methods from validate_ctx to state
Change-Id: Ia43f6863b463bc3834e2df27b69f64291194f7d9 Signed-off-by: Bhawanpreet Lakha <[email protected]> Reviewed-by: Tony Cheng <[email protected]> Acked-by: Harry Wentland <[email protected]> --- 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 3f8429b1fd4e..7a408d753be8 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -709,7 +709,7 @@ dm_atomic_state_alloc(struct drm_device *dev) atomic_inc(&new_ctx->ref_count); - dc_resource_validate_ctx_copy_construct_current(dc, new_ctx); + dc_resource_state_copy_construct_current(dc, new_ctx); state->context = new_ctx; diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 522555d752a5..20362b1f8c1d 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1013,7 +1013,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); } } @@ -1285,7 +1285,7 @@ void dc_update_planes_and_stream(struct dc *dc, atomic_inc(&context->ref_count); - dc_resource_validate_ctx_copy_construct( + dc_resource_state_copy_construct( dc->current_state, context); /*remove old surfaces from context */ @@ -1628,7 +1628,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 b5ccbdb3d33b..c80650ed70dd 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 2890dbb55a63..1b6ed21b9bb3 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.11.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
