Commit fe04afad authored by Joshua Aberback's avatar Joshua Aberback Committed by Alex Deucher
Browse files

drm/amd/display: Adjust static-ness of resource functions 



[Why]
Register definitions are asic-specific, so functions that use registers of
a particular asic should be static, to be exposed in asic-specific function
pointer structures.

[How]
 - make register-definition-using functions static
 - make some functions non-static, for future use
 - remove duplicate function definition

Signed-off-by: default avatarJoshua Aberback <joshua.aberback@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bcca6298

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ struct display_stream_compressor *dcn20_dsc_create( 
	struct dc_context *ctx, uint32_t inst);

void dcn20_dsc_destroy(struct display_stream_compressor **dsc);



void dcn20_patch_bounding_box(struct dc *dc, struct _vcs_dpi_soc_bounding_box_st *bb);

void dcn20_cap_soc_clocks(

		struct _vcs_dpi_soc_bounding_box_st *bb,

		struct pp_smu_nv_clock_table max_clocks);

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c

+15 −12
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ void dcn30_dpp_destroy(struct dpp **dpp) 
	*dpp = NULL;

}



struct dpp *dcn30_dpp_create(

static struct dpp *dcn30_dpp_create(

	struct dc_context *ctx,

	uint32_t inst)

{
@@ -889,7 +889,8 @@ struct dpp *dcn30_dpp_create( 
	kfree(dpp);

	return NULL;

}

struct output_pixel_processor *dcn30_opp_create(



static struct output_pixel_processor *dcn30_opp_create(

	struct dc_context *ctx, uint32_t inst)

{

	struct dcn20_opp *opp =
@@ -905,7 +906,7 @@ struct output_pixel_processor *dcn30_opp_create( 
	return &opp->base;

}



struct dce_aux *dcn30_aux_engine_create(

static struct dce_aux *dcn30_aux_engine_create(

	struct dc_context *ctx,

	uint32_t inst)

{
@@ -924,6 +925,7 @@ struct dce_aux *dcn30_aux_engine_create( 


	return &aux_engine->base;

}



#define i2c_inst_regs(id) { I2C_HW_ENGINE_COMMON_REG_LIST(id) }



static const struct dce_i2c_registers i2c_hw_regs[] = {
@@ -943,7 +945,7 @@ static const struct dce_i2c_mask i2c_masks = { 
		I2C_COMMON_MASK_SH_LIST_DCN2(_MASK)

};



struct dce_i2c_hw *dcn30_i2c_hw_create(

static struct dce_i2c_hw *dcn30_i2c_hw_create(

	struct dc_context *ctx,

	uint32_t inst)

{
@@ -958,6 +960,7 @@ struct dce_i2c_hw *dcn30_i2c_hw_create( 


	return dce_i2c_hw;

}



static struct mpc *dcn30_mpc_create(

		struct dc_context *ctx,

		int num_mpcc,
@@ -1008,7 +1011,7 @@ struct hubbub *dcn30_hubbub_create(struct dc_context *ctx) 
	return &hubbub3->base;

}



struct timing_generator *dcn30_timing_generator_create(

static struct timing_generator *dcn30_timing_generator_create(

		struct dc_context *ctx,

		uint32_t instance)

{
@@ -1042,7 +1045,7 @@ static const struct encoder_feature_support link_enc_feature = { 
		.flags.bits.IS_TPS4_CAPABLE = true

};



struct link_encoder *dcn30_link_encoder_create(

static struct link_encoder *dcn30_link_encoder_create(

	const struct encoder_init_data *enc_init_data)

{

	struct dcn20_link_encoder *enc20 =
@@ -1063,7 +1066,7 @@ struct link_encoder *dcn30_link_encoder_create( 
	return &enc20->enc10.base;

}



struct panel_cntl *dcn30_panel_cntl_create(const struct panel_cntl_init_data *init_data)

static struct panel_cntl *dcn30_panel_cntl_create(const struct panel_cntl_init_data *init_data)

{

	struct dce_panel_cntl *panel_cntl =

		kzalloc(sizeof(struct dce_panel_cntl), GFP_KERNEL);
@@ -1311,7 +1314,7 @@ static void dcn30_resource_destruct(struct dcn30_resource_pool *pool) 
		dcn_dccg_destroy(&pool->base.dccg);

}



struct hubp *dcn30_hubp_create(

static struct hubp *dcn30_hubp_create(

	struct dc_context *ctx,

	uint32_t inst)

{
@@ -1330,7 +1333,7 @@ struct hubp *dcn30_hubp_create( 
	return NULL;

}



bool dcn30_dwbc_create(struct dc_context *ctx, struct resource_pool *pool)

static bool dcn30_dwbc_create(struct dc_context *ctx, struct resource_pool *pool)

{

	int i;

	uint32_t pipe_count = pool->res_cap->num_dwb;
@@ -1355,7 +1358,7 @@ bool dcn30_dwbc_create(struct dc_context *ctx, struct resource_pool *pool) 
	return true;

}



bool dcn30_mmhubbub_create(struct dc_context *ctx, struct resource_pool *pool)

static bool dcn30_mmhubbub_create(struct dc_context *ctx, struct resource_pool *pool)

{

	int i;

	uint32_t pipe_count = pool->res_cap->num_dwb;
@@ -2292,7 +2295,7 @@ static void get_optimal_dcfclk_fclk_for_uclk(unsigned int uclk_mts, 
               (dcn3_0_soc.return_bus_width_bytes * (dcn3_0_soc.max_avg_sdp_bw_use_normal_percent / 100));

}



static void dcn30_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)

void dcn30_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)

{

	unsigned int i, j;

	unsigned int num_states = 0;

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h

+3 −0
Original line number Diff line number Diff line
@@ -79,4 +79,7 @@ enum dc_status dcn30_add_stream_to_ctx( 
		struct dc *dc,

		struct dc_state *new_ctx,

		struct dc_stream_state *dc_stream);



void dcn30_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params);



#endif /* _DCN30_RESOURCE_H_ */