From 3d99b4a3d41a066425d17e4d4b50ea96fce13248 Mon Sep 17 00:00:00 2001 From: Yongqiang Sun Date: Wed, 3 Feb 2016 11:48:01 -0500 Subject: [PATCH 0767/1110] drm/amd/dal: Rename allocate mem input interface. Signed-off-by: Yongqiang Sun Acked-by: Jordan Lazare --- drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 4 ++-- drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c | 9 ++++----- drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h | 8 ++++---- drivers/gpu/drm/amd/dal/dc/inc/mem_input.h | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c index 2a92cfd..6ae14d9 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c @@ -791,7 +791,7 @@ static enum dc_status apply_single_controller_ctx_to_hw(uint8_t controller_idx, } /*TODO: mst support - use total stream count*/ - stream->mi->funcs->mem_input_allocate_dmif_buffer( + stream->mi->funcs->allocate_mem_input( stream->mi, &stream->public.timing, context->target_count); @@ -1507,7 +1507,7 @@ static void reset_single_stream_hw_ctx( stream->tg->funcs->set_blank(stream->tg, true); stream->tg->funcs->disable_crtc(stream->tg); - stream->mi->funcs->mem_input_deallocate_dmif_buffer( + stream->mi->funcs->free_mem_input( stream->mi, context->target_count); stream->xfm->funcs->transform_set_scaler_bypass(stream->xfm); unreference_clock_source(&context->res_ctx, stream->clock_source); diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c index 3a928e6..6d88afe 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c @@ -760,7 +760,7 @@ static uint32_t get_dmif_switch_time_us(struct dc_crtc_timing *timing) return frame_time; } -void dce110_mem_input_allocate_dmif_buffer( +void dce110_allocate_mem_input( struct mem_input *mi, struct dc_crtc_timing *timing, uint32_t paths_num) @@ -884,7 +884,7 @@ static void deallocate_dmif_buffer_helper( DMIF_BUFFERS_ALLOCATION_COMPLETED)); } -void dce110_mem_input_deallocate_dmif_buffer( +void dce110_free_mem_input( struct mem_input *mi, uint32_t paths_num) { struct dce110_mem_input *bm_dce110 = TO_DCE110_MEM_INPUT(mi); @@ -925,9 +925,8 @@ static struct mem_input_funcs dce110_mem_input_funcs = { dce110_mem_input_program_safe_display_marks, .mem_input_program_display_marks = dce110_mem_input_program_display_marks, - .mem_input_allocate_dmif_buffer = dce110_mem_input_allocate_dmif_buffer, - .mem_input_deallocate_dmif_buffer = - dce110_mem_input_deallocate_dmif_buffer, + .allocate_mem_input = dce110_allocate_mem_input, + .free_mem_input = dce110_free_mem_input, .mem_input_program_surface_flip_and_addr = dce110_mem_input_program_surface_flip_and_addr, .mem_input_program_surface_config = diff --git a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h index 5a4e5fe..ec83ee1 100644 --- a/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h +++ b/drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h @@ -72,22 +72,22 @@ void dce110_mem_input_program_display_marks( uint32_t pstate_blackout_duration_ns); /* - * dce110_mem_input_allocate_dmif_buffer + * dce110_allocate_mem_input * * This function will allocate a dmif buffer and program required * pixel duration for pipe */ -void dce110_mem_input_allocate_dmif_buffer( +void dce110_allocate_mem_input( struct mem_input *mem_input, struct dc_crtc_timing *timing, uint32_t paths_num); /* - * dce110_mem_input_deallocate_dmif_buffer + * dce110_free_mem_input * * This function will deallocate a dmif buffer from pipe */ -void dce110_mem_input_deallocate_dmif_buffer( +void dce110_free_mem_input( struct mem_input *mem_input, uint32_t paths_num); /* diff --git a/drivers/gpu/drm/amd/dal/dc/inc/mem_input.h b/drivers/gpu/drm/amd/dal/dc/inc/mem_input.h index 7d6335d..cace055 100644 --- a/drivers/gpu/drm/amd/dal/dc/inc/mem_input.h +++ b/drivers/gpu/drm/amd/dal/dc/inc/mem_input.h @@ -44,11 +44,11 @@ struct mem_input_funcs { uint32_t h_total, uint32_t pixel_clk_in_khz, uint32_t pstate_blackout_duration_ns); - void (*mem_input_allocate_dmif_buffer)( + void (*allocate_mem_input)( struct mem_input *mem_input, struct dc_crtc_timing *timing, uint32_t paths_num); - void (*mem_input_deallocate_dmif_buffer)( + void (*free_mem_input)( struct mem_input *mem_input, uint32_t paths_num); bool (*mem_input_program_surface_flip_and_addr)( struct mem_input *mem_input, -- 2.7.4